[Libreoffice-commits] help.git: source/text
source/text/schart/01/0405.xhp | 55 ++--- 1 file changed, 39 insertions(+), 16 deletions(-) New commits: commit 29eb53b6fffb2620dd32860c6d9093dfa5c11dcd Author: Gabor Kelemen Date: Tue May 30 08:16:46 2017 +0200 Fix ahelps and bookmarks on X/Y Error Bars page Change-Id: Ic551d68721a5c045e62f279add57942ea7a879cb Reviewed-on: https://gerrit.libreoffice.org/38177 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/schart/01/0405.xhp b/source/text/schart/01/0405.xhp index d8097cbaf..69b54d075 100644 --- a/source/text/schart/01/0405.xhp +++ b/source/text/schart/01/0405.xhp @@ -44,19 +44,15 @@ None -Does not show any error bars. +Does not show any error bars. - - - - Constant value -Displays constant values that you specify in the Parameters area. +Displays constant values that you specify in the Parameters area. Percentage -Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area. +Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area. @@ -64,22 +60,49 @@ Functions Select a function to calculate the error bars. Standard Error: Displays the standard error. -Variance: Displays the variance calculated from the number of data points and respective values. -Standard Deviation: Displays the standard deviation (square root of the variance). Unlike other functions, error bars are centered on the mean. -Error Margin: Displays the highest error margin in percent according to the highest value of the data group. Set the percentage in the Parameters area. +Variance: Displays the variance calculated from the number of data points and respective values. +Standard Deviation: Displays the standard deviation (square root of the variance). Unlike other functions, error bars are centered on the mean. +Error Margin: Displays the highest error margin in percent according to the highest value of the data group. Set the percentage in the Parameters area. + + + Cell Range Click Cell Range and then specify a cell range from which to take the positive and negative error bar values. + + + + Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size. + From Data Table -For a chart with its own data, the error bar values can be entered in the chart data table. The Data Table dialog shows additional columns titled Positive X or Y-Error-Bars and Negative X or Y-Error-Bars.Positive (+) -Enter the value to add to the displayed value as the positive error value.Negative (-) -Enter the value to subtract from the displayed value as the negative error value.Positive (+) when Cell Range is selected -Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet.Negative (-) when Cell Range is selected +For a chart with its own data, the error bar values can be entered in the chart data table. The Data Table dialog shows additional columns titled Positive X or Y-Error-Bars and Negative X or Y-Error-Bars. + +Positive (+) + + +Enter the value to add to the displayed value as the positive error value. + +Negative (-) + + +Enter the value to subtract from the displayed value as the negative error value. + +Positive (+) when Cell Range is selected + + +Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet. + +Negative (-) when Cell Range is selected + + Enter the address range from where to get the negative error values. Use the Shrink button to select the range from a sheet. + + + Same value for both Enable to use the positive error values also as negative error values. You can only change the value of the "Positve (+)" box. That value gets copied to the "Negative (-)" box automatically. -Error indicator -Specifies the error indicator. +Error Indicator +Specifies the error indicator. Positive and Negative ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/06010601.xhp | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) New commits: commit 45f6f1757199dbebd364de8d2e1964e59d0c6f1f Author: Gabor Kelemen Date: Tue May 30 08:17:51 2017 +0200 Add missing bookmarks to Edit Dictionary page Change-Id: I1ecee4903c2216f12a64798b9f0e49f27ae81804 Reviewed-on: https://gerrit.libreoffice.org/38178 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/shared/01/06010601.xhp b/source/text/shared/01/06010601.xhp index a9c9cf77a..0966f690f 100644 --- a/source/text/shared/01/06010601.xhp +++ b/source/text/shared/01/06010601.xhp @@ -33,29 +33,38 @@ common terms;Chinese dictionary dictionaries;common terms in simplified and traditional chinese - + Edit Dictionary Edit the Chinese conversion terms. You can use this dialog to edit, to add, or to delete entries from the conversion dictionary. The file path name for the conversion dictionary is user/wordbook/commonterms.ctd. You cannot delete the default entries in this file. + Traditional Chinese to Simplified Chinese Converts traditional Chinese to simplified Chinese. + Simplified Chinese to Traditional Chinese Converts simplified Chinese to traditional Chinese. + Reverse Mapping Automatically adds the reverse mapping direction to the list for each modification that you enter. + Term Enter the text that you want to replace with the Mapping term. + Mapping Enter the text that you want to replace the Term with. + Property Defines the class of the selected term. + Add Adds the term to the conversion dictionary. If the term is already in the dictionary, the new term receives precedence. + Modify Saves the modified entry to the database file. + Delete Removes the selected user-defined entry from the dictionary. ___ 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 66a1f42f20dc7b88cc59096907c970c0a2eac2b4 Author: Gabor Kelemen Date: Tue May 30 08:16:46 2017 +0200 Updated core Project: help 29eb53b6fffb2620dd32860c6d9093dfa5c11dcd Fix ahelps and bookmarks on X/Y Error Bars page Change-Id: Ic551d68721a5c045e62f279add57942ea7a879cb Reviewed-on: https://gerrit.libreoffice.org/38177 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 2d55618673b1..29eb53b6fffb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2d55618673b1db54dd3439f1054413fc71d5a2a0 +Subproject commit 29eb53b6fffb2620dd32860c6d9093dfa5c11dcd ___ 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 a909257abdc869a8d56a79f29b2de12725b74e68 Author: Gabor Kelemen Date: Tue May 30 08:17:51 2017 +0200 Updated core Project: help 45f6f1757199dbebd364de8d2e1964e59d0c6f1f Add missing bookmarks to Edit Dictionary page Change-Id: I1ecee4903c2216f12a64798b9f0e49f27ae81804 Reviewed-on: https://gerrit.libreoffice.org/38178 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 29eb53b6fffb..45f6f1757199 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 29eb53b6fffb2620dd32860c6d9093dfa5c11dcd +Subproject commit 45f6f1757199dbebd364de8d2e1964e59d0c6f1f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - connectivity/source
connectivity/source/drivers/firebird/Table.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit c5ea8e46626affeee5465330554e4864947b163b
Author: Julien Nabet
Date: Thu May 25 10:14:30 2017 +0200
Related tdf#108068: Use new name of column when it's been changed
First fix simple case, the rename of a column which is not a primary key
Change-Id: Ia0de8e531021cbec0409408008c541c25a4bcd85
Reviewed-on: https://gerrit.libreoffice.org/38014
Tested-by: Jenkins
(cherry picked from commit c751318868f3f0082b2c86df493216d452b8ecc5)
Reviewed-on: https://gerrit.libreoffice.org/38022
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/connectivity/source/drivers/firebird/Table.cxx
b/connectivity/source/drivers/firebird/Table.cxx
index 7f71d1ebfbac..eefcc9698e99 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -132,17 +132,6 @@ void SAL_CALL Table::alterColumnByName(const OUString&
rColName,
bool bDefaultChanged = xColumn->getPropertyValue("DefaultValue")
!=
rDescriptor->getPropertyValue("DefaultValue");
-// TODO: quote identifiers as needed.
-if (bNameChanged)
-{
-OUString sNewTableName;
-rDescriptor->getPropertyValue("Name") >>= sNewTableName;
-OUString sSql(getAlterTableColumn(rColName)
-+ " TO \"" + sNewTableName + "\"");
-
-getConnection()->createStatement()->execute(sSql);
-}
-
if (bTypeChanged || bTypeNameChanged || bPrecisionChanged || bScaleChanged)
{
// If bPrecisionChanged this will only succeed if we have increased the
@@ -216,6 +205,17 @@ void SAL_CALL Table::alterColumnByName(const OUString&
rColName,
getConnection()->createStatement()->execute(sSql);
}
+// TODO: quote identifiers as needed.
+if (bNameChanged)
+{
+OUString sNewTableName;
+rDescriptor->getPropertyValue("Name") >>= sNewTableName;
+OUString sSql(getAlterTableColumn(rColName)
++ " TO \"" + sNewTableName + "\"");
+
+getConnection()->createStatement()->execute(sSql);
+}
+
m_pColumns->refresh();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal
include/sal/types.h |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit cd3d9ed0ad281dfcc2b71c393e1b124ae78c4dcc Author: Noel Grandin Date: Tue May 30 09:06:51 2017 +0200 define SAL_RETURNS_NONNULL as LIBO_INTERNAL_ONLY and improve the comment Change-Id: I832fa0133810fee920024e7df9ff3c5c1c335582 diff --git a/include/sal/types.h b/include/sal/types.h index b6d6730e88a5..053e53d87b8d 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -687,9 +687,9 @@ inline char16_t const * SAL_U(wchar_t const * p) /// @endcond #endif - -/** Indicate where function/methods that return a pointer always -return a non-nullptr value. +/// @cond INTERNAL +/** Annotate pointer-returning functions to indicate that such a pointer +is never nullptr. Note that MSVC supports this feature via it's SAL _Ret_notnull_ annotation, but since it's in a completely different place on @@ -697,11 +697,14 @@ inline char16_t const * SAL_U(wchar_t const * p) @since LibreOffice 5.5 */ +#if defined LIBO_INTERNAL_ONLY #if (defined __GNUC__ && __GNUC__ > 4) || defined __clang__ #define SAL_RETURNS_NONNULL __attribute__((returns_nonnull)) #else #define SAL_RETURNS_NONNULL #endif +#endif +/// @endcond #endif // INCLUDED_SAL_TYPES_H ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
5 new defect(s) introduced to LibreOffice found with Coverity Scan.
2 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 5 of 5 defect(s)
** CID 1411569: Null pointer dereferences (FORWARD_NULL)
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1790 in
SwTiledRenderingTest::testDisableUndoRepair()()
*** CID 1411569: Null pointer dereferences (FORWARD_NULL)
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1790 in
SwTiledRenderingTest::testDisableUndoRepair()()
1784 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet2.GetItemState(SID_UNDO));
1785 CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item *
>(aItemSet2.GetItem(SID_UNDO)));
1786 // first view, undo conflict
1787 pView1->GetState(aItemSet1);
1788 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet1.GetItemState(SID_UNDO));
1789 CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item *
>(aItemSet1.GetItem(SID_UNDO)));
>>> CID 1411569: Null pointer dereferences (FORWARD_NULL)
>>> Dynamic cast to pointer "dynamic_cast >> *>(aItemSet1.GetItem(5701, true))" can return "NULL".
1790
CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT), dynamic_cast<
const SfxUInt32Item * >(aItemSet1.GetItem(SID_UNDO))->GetValue());
1791 }
1792
1793 // Insert a character in the first view.
1794 SfxLokHelper::setView(nView1);
1795 pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'l', 0);
** CID 1411568: Null pointer dereferences (FORWARD_NULL)
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1764 in
SwTiledRenderingTest::testDisableUndoRepair()::[lambda() (instance
1)]::operator ()() const()
*** CID 1411568: Null pointer dereferences (FORWARD_NULL)
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1764 in
SwTiledRenderingTest::testDisableUndoRepair()::[lambda() (instance
1)]::operator ()() const()
1758 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet1.GetItemState(SID_UNDO));
1759 CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item *
>(aItemSet1.GetItem(SID_UNDO)));
1760 // second view, undo conflict
1761 pView2->GetState(aItemSet2);
1762 CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet2.GetItemState(SID_UNDO));
1763 CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item *
>(aItemSet2.GetItem(SID_UNDO)));
>>> CID 1411568: Null pointer dereferences (FORWARD_NULL)
>>> Dynamic cast to pointer "dynamic_cast >> *>(aItemSet2.GetItem(5701, true))" can return "NULL".
1764
CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT), dynamic_cast<
const SfxUInt32Item * >(aItemSet2.GetItem(SID_UNDO))->GetValue());
1765 };
1766
1767 // Insert a character in the first view.
1768 SfxLokHelper::setView(nView1);
1769 pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'k', 0);
** CID 1411567:(FORWARD_NULL)
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1740 in
SwTiledRenderingTest::testDisableUndoRepair()()
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1740 in
SwTiledRenderingTest::testDisableUndoRepair()()
*** CID 1411567:(FORWARD_NULL)
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1740 in
SwTiledRenderingTest::testDisableUndoRepair()()
1734 SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
1735 ViewCallback aView1;
1736 SwView* pView1 = dynamic_cast(SfxViewShell::Current());
1737 int nView1 = SfxLokHelper::getView();
1738 SfxLokHelper::createView();
1739 ViewCallback aView2;
>>> CID 1411567:(FORWARD_NULL)
>>> Assigning: "pView2" = "dynamic_cast >> *>(SfxViewShell::Current())".
1740 SwView* pView2 = dynamic_cast(SfxViewShell::Current());
1741 int nView2 = SfxLokHelper::getView();
1742
1743 {
1744 SfxItemSet
aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
1745 SfxItemSet
aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1740 in
SwTiledRenderingTest::testDisableUndoRepair()()
1734 SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
1735 ViewCallback aView1;
1736 SwView* pView1 = dynamic_cast(SfxViewShell::Current());
1737 int nView1 = SfxLokHelper::getView();
1738 SfxLokHelper::createView();
17
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - connectivity/source
connectivity/source/drivers/firebird/Table.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 7b7c43f3c86eeeb7c092621464a747604a1cd48a
Author: Julien Nabet
Date: Thu May 25 10:14:30 2017 +0200
Related tdf#108068: Use new name of column when it's been changed
First fix simple case, the rename of a column which is not a primary key
Change-Id: Ia0de8e531021cbec0409408008c541c25a4bcd85
Reviewed-on: https://gerrit.libreoffice.org/38014
Tested-by: Jenkins
(cherry picked from commit c751318868f3f0082b2c86df493216d452b8ecc5)
Reviewed-on: https://gerrit.libreoffice.org/38023
Reviewed-by: Lionel Elie Mamane
diff --git a/connectivity/source/drivers/firebird/Table.cxx
b/connectivity/source/drivers/firebird/Table.cxx
index fea904630ffb..21a59e4ee0c2 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -133,17 +133,6 @@ void SAL_CALL Table::alterColumnByName(const OUString&
rColName,
bool bDefaultChanged = xColumn->getPropertyValue("DefaultValue")
!=
rDescriptor->getPropertyValue("DefaultValue");
-// TODO: quote identifiers as needed.
-if (bNameChanged)
-{
-OUString sNewTableName;
-rDescriptor->getPropertyValue("Name") >>= sNewTableName;
-OUString sSql(getAlterTableColumn(rColName)
-+ " TO \"" + sNewTableName + "\"");
-
-getConnection()->createStatement()->execute(sSql);
-}
-
if (bTypeChanged || bTypeNameChanged || bPrecisionChanged || bScaleChanged)
{
// If bPrecisionChanged this will only succeed if we have increased the
@@ -217,6 +206,17 @@ void SAL_CALL Table::alterColumnByName(const OUString&
rColName,
getConnection()->createStatement()->execute(sSql);
}
+// TODO: quote identifiers as needed.
+if (bNameChanged)
+{
+OUString sNewTableName;
+rDescriptor->getPropertyValue("Name") >>= sNewTableName;
+OUString sSql(getAlterTableColumn(rColName)
++ " TO \"" + sNewTableName + "\"");
+
+getConnection()->createStatement()->execute(sSql);
+}
+
m_pColumns->refresh();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal
include/sal/types.h |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit b36120b8e1991bd4939b7d4838a4f0333c8a3016 Author: Noel Grandin Date: Tue May 30 09:28:22 2017 +0200 and fix my previous commit Change-Id: I63a22d5cf7a45d7b6fb3d1b356aa98ff954449e5 diff --git a/include/sal/types.h b/include/sal/types.h index 053e53d87b8d..9d5f699c9794 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -697,13 +697,11 @@ inline char16_t const * SAL_U(wchar_t const * p) @since LibreOffice 5.5 */ -#if defined LIBO_INTERNAL_ONLY -#if (defined __GNUC__ && __GNUC__ > 4) || defined __clang__ +#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && __GNUC__ > 4) || defined __clang__) #define SAL_RETURNS_NONNULL __attribute__((returns_nonnull)) #else #define SAL_RETURNS_NONNULL #endif -#endif /// @endcond #endif // INCLUDED_SAL_TYPES_H ___ 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 21c36108e453df88994e4c9fac11b540ac386b68 Author: Gabor Kelemen Date: Thu May 18 23:19:03 2017 +0200 Updated core Project: help 1ae135d7569571bc38fc1bcf0dfd24610039a86e Mass remove excess spaces from inside tags This is fallout from the l10n and oldref attribute removal. Some tags were broken into two rows and the second was indented with spaces. The line break was removed along the tags, but those spaces were not. Command I used to catch these: find source/text/ -name "*xhp" | xargs sed -i -e 's#\" *>#\">#g' Change-Id: I6f9bad46cbfb7416950bee8230e358a3dd851def Reviewed-on: https://gerrit.libreoffice.org/37791 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 45f6f1757199..1ae135d75695 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 45f6f1757199dbebd364de8d2e1964e59d0c6f1f +Subproject commit 1ae135d7569571bc38fc1bcf0dfd24610039a86e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/0104.xhp |4 source/text/sbasic/shared/03132100.xhp |2 source/text/scalc/01/02120100.xhp | 12 - source/text/scalc/01/04060100.xhp | 12 - source/text/scalc/01/04060101.xhp | 76 +- source/text/scalc/01/04060103.xhp | 84 +-- source/text/scalc/01/04060105.xhp | 32 ++-- source/text/scalc/01/04060109.xhp | 112 +++ source/text/scalc/01/04060116.xhp | 88 ++-- source/text/scalc/01/04060119.xhp |2 source/text/scalc/01/04060182.xhp | 88 ++-- source/text/scalc/01/04060185.xhp | 142 ++-- source/text/scalc/01/0409.xhp |2 source/text/scalc/01/05080300.xhp |2 source/text/scalc/01/0605.xhp |2 source/text/scalc/01/0606.xhp |2 source/text/scalc/01/12040300.xhp |2 source/text/scalc/01/12090102.xhp |8 - source/text/scalc/01/12090400.xhp |2 source/text/scalc/01/func_datevalue.xhp |6 source/text/scalc/guide/autoformat.xhp |4 source/text/scalc/guide/background.xhp |4 source/text/scalc/guide/cell_protect.xhp|2 source/text/scalc/guide/cell_unprotect.xhp |2 source/text/scalc/guide/cellreference_dragdrop.xhp |2 source/text/scalc/guide/cellreferences.xhp |2 source/text/scalc/guide/cellstyle_conditional.xhp | 12 - source/text/scalc/guide/cellstyle_minusvalue.xhp|2 source/text/scalc/guide/csv_formula.xhp |2 source/text/scalc/guide/database_define.xhp |2 source/text/scalc/guide/database_filter.xhp |4 source/text/scalc/guide/database_sort.xhp |2 source/text/scalc/guide/filters.xhp |2 source/text/scalc/guide/format_value_userdef.xhp|2 source/text/scalc/guide/multitables.xhp |8 - source/text/scalc/guide/note_insert.xhp |2 source/text/scalc/guide/rename_table.xhp|2 source/text/scalc/guide/text_numbers.xhp|2 source/text/schart/01/0403.xhp |8 - source/text/schart/01/0406.xhp |2 source/text/schart/02/0119.xhp |2 source/text/schart/02/0120.xhp |2 source/text/schart/main.xhp |2 source/text/sdraw/04/0102.xhp |4 source/text/sdraw/guide/text_enter.xhp |8 - source/text/sdraw/main0104.xhp |6 source/text/shared/00/0001.xhp | 34 ++-- source/text/shared/00/0021.xhp |2 source/text/shared/01/01100200.xhp | 12 - source/text/shared/01/01160300.xhp | 10 - source/text/shared/01/0210.xhp | 12 - source/text/shared/01/0211.xhp |2 source/text/shared/01/0211.xhp | 30 ++-- source/text/shared/01/02220100.xhp |2 source/text/shared/01/02230401.xhp | 28 +-- source/text/shared/01/0225.xhp | 12 - source/text/shared/01/05020200.xhp | 24 +-- source/text/shared/01/05030100.xhp | 32 ++-- source/text/shared/01/05030600.xhp | 22 +-- source/text/shared/01/05040100.xhp |4 source/text/shared/01/05040300.xhp | 18 +- source/text/shared/01/05040400.xhp |2 source/text/shared/01/05210300.xhp | 10 - source/text/shared/01/0522.xhp | 20 +- source/text/shared/01/05340100.xhp |2 source/text/shared/01/0601.xhp | 20 +- source/text/shared/01/0602.xhp | 12 - source/text/shared/01/06040100.xhp | 30 ++-- source/text/shared/01/06040600.xhp | 22 +-- source/text/shared/01/06050200.xhp |2 source/text/shared/01/06050500.xhp | 30 ++-- source/text/shared/01/06130200.xhp |2 source/text/shared/01/password_dlg.xhp |2 source/text/shared/02/0114.xhp | 26 +-- source/text/shared/02/01170101.xhp | 108 +++ source/text/shared/02/01170103.xhp | 28 +-- source/text/shared/02/01170202.xhp | 30 ++-- source/text/shared/02/0217.xhp |2 source/text/shared/02/0907.xhp |4 source/text/shared/
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - cppcanvas/qa desktop/qa include/sfx2 sfx2/source svx/CppunitTest_svx_unit.mk svx/Executable_gengal.mk svx/qa svx/source sw/CppunitTes
cppcanvas/qa/extras/emfplus/emfplus.cxx |2 ++
desktop/qa/desktop_lib/test_desktop_lib.cxx |1 +
include/sfx2/app.hxx|2 +-
sfx2/source/appl/module.cxx |2 +-
sfx2/source/notify/globalevents.cxx |2 +-
svx/CppunitTest_svx_unit.mk |1 +
svx/Executable_gengal.mk|1 +
svx/qa/unit/xoutdev.cxx |7 +++
svx/source/gengal/gengal.cxx|4
sw/CppunitTest_sw_docbookexport.mk |1 +
sw/CppunitTest_sw_globalfilter.mk |1 +
sw/CppunitTest_sw_odfexport.mk |1 +
sw/CppunitTest_sw_odfimport.mk |1 +
sw/CppunitTest_sw_ooxmlexport8.mk |1 +
sw/CppunitTest_sw_ooxmlimport.mk|1 +
sw/CppunitTest_sw_rtfexport.mk |1 +
sw/CppunitTest_sw_rtfimport.mk |1 +
sw/CppunitTest_sw_ww8export2.mk |1 +
sw/CppunitTest_sw_ww8import.mk |1 +
sw/ooxmlexport_setup.mk |1 +
sw/qa/extras/inc/swmodeltestbase.hxx|3 ++-
21 files changed, 32 insertions(+), 4 deletions(-)
New commits:
commit f5a6844e683f8d97c60f5cf19aab00d41209cfc3
Author: Caolán McNamara
Date: Tue Mar 7 20:33:43 2017 +
make SfxGetpApp just get and move GetOrCreate to the periphery
Reviewed-on: https://gerrit.libreoffice.org/34957
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry-picked from commit 3d213b3dc5130bdbacbd64be00867eecad6373e8)
Conflicts:
svx/source/gengal/gengal.cxx
Change-Id: If3b22635e46dbccf0fad101f51bb653cbbcd3a32
Reviewed-on: https://gerrit.libreoffice.org/38166
Reviewed-by: László Németh
Tested-by: László Németh
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index c83c2e992538..4c8a7774f0d1 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -13,6 +13,7 @@
#include
#include
+#include
#include
#include
#include
@@ -37,6 +38,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
+SfxApplication::GetOrCreate();
};
virtual void tearDown() override
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index dae50d66314c..50cf4d633bd3 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -62,6 +62,7 @@ public:
{
UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
+SfxApplication::GetOrCreate();
};
virtual void tearDown() override
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 74d29003aa9e..6b5a1af72aac 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -248,7 +248,7 @@ public:
inline SfxApplication* SfxGetpApp()
{
-return SfxApplication::GetOrCreate();
+return SfxApplication::Get();
}
#endif
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 72d447b6ec26..830f7eb7696a 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -115,7 +115,7 @@ SfxModule::SfxModule( ResMgr* pMgrP,
std::initializer_list pF
void SfxModule::Construct_Impl()
{
-SfxApplication *pApp = SfxGetpApp();
+SfxApplication *pApp = SfxApplication::GetOrCreate();
pImpl = new SfxModule_Impl;
pImpl->pSlotPool = new SfxSlotPool(&pApp->GetAppSlotPool_Impl());
diff --git a/sfx2/source/notify/globalevents.cxx
b/sfx2/source/notify/globalevents.cxx
index 9cecd83e5740..69e23ceea6f3 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -164,7 +164,7 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const
uno::Reference < uno::XCompone
, pImp(nullptr )
{
m_refCount++;
-SfxGetpApp();
+SfxApplication::GetOrCreate();
pImp = new GlobalEventConfig();
m_xEvents = pImp;
m_refCount--;
diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk
index 6563d60e4eaf..0bac905a9dc9 100644
--- a/svx/CppunitTest_svx_unit.mk
+++ b/svx/CppunitTest_svx_unit.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \
$(eval $(call gb_CppunitTest_use_libraries,svx_unit, \
sal \
+ sfx \
svxcore \
tl \
unotest \
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
index 49b3b34df987..0cecfa02357c 100644
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_libraries,gengal,\
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4d1ec0c9f128ea4a353aba1e3da350f72c26c6db Author: Gabor Kelemen Date: Thu May 18 23:19:03 2017 +0200 Updated core Project: help c75dbcd8364d8f443465d4c9b2461356a6b89869 Mass remove excess spaces from inside tags This is fallout from the l10n and oldref attribute removal. Some tags were broken into two rows and the second was indented with spaces. The line break was removed along the tags, but those spaces were not. Command I used to catch these: find source/text/ -name "*xhp" | xargs sed -i -e 's#\" *>#\">#g' Change-Id: I6f9bad46cbfb7416950bee8230e358a3dd851def Reviewed-on: https://gerrit.libreoffice.org/37791 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier (cherry picked from commit 1ae135d7569571bc38fc1bcf0dfd24610039a86e) Reviewed-on: https://gerrit.libreoffice.org/38182 diff --git a/helpcontent2 b/helpcontent2 index 6797c4310d66..c75dbcd8364d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6797c4310d6692464351c23327aac99cfb07 +Subproject commit c75dbcd8364d8f443465d4c9b2461356a6b89869 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-5-4' - source/text
source/text/sbasic/shared/0104.xhp |4 source/text/sbasic/shared/03132100.xhp |2 source/text/scalc/01/02120100.xhp | 12 - source/text/scalc/01/04060100.xhp | 12 - source/text/scalc/01/04060101.xhp | 76 +- source/text/scalc/01/04060103.xhp | 84 +-- source/text/scalc/01/04060105.xhp | 32 ++-- source/text/scalc/01/04060109.xhp | 112 +++ source/text/scalc/01/04060116.xhp | 88 ++-- source/text/scalc/01/04060119.xhp |2 source/text/scalc/01/04060182.xhp | 88 ++-- source/text/scalc/01/04060185.xhp | 142 ++-- source/text/scalc/01/0409.xhp |2 source/text/scalc/01/05080300.xhp |2 source/text/scalc/01/0605.xhp |2 source/text/scalc/01/0606.xhp |2 source/text/scalc/01/12040300.xhp |2 source/text/scalc/01/12090102.xhp |8 - source/text/scalc/01/12090400.xhp |2 source/text/scalc/01/func_datevalue.xhp |6 source/text/scalc/guide/autoformat.xhp |4 source/text/scalc/guide/background.xhp |4 source/text/scalc/guide/cell_protect.xhp|2 source/text/scalc/guide/cell_unprotect.xhp |2 source/text/scalc/guide/cellreference_dragdrop.xhp |2 source/text/scalc/guide/cellreferences.xhp |2 source/text/scalc/guide/cellstyle_conditional.xhp | 12 - source/text/scalc/guide/cellstyle_minusvalue.xhp|2 source/text/scalc/guide/csv_formula.xhp |2 source/text/scalc/guide/database_define.xhp |2 source/text/scalc/guide/database_filter.xhp |4 source/text/scalc/guide/database_sort.xhp |2 source/text/scalc/guide/filters.xhp |2 source/text/scalc/guide/format_value_userdef.xhp|2 source/text/scalc/guide/multitables.xhp |8 - source/text/scalc/guide/note_insert.xhp |2 source/text/scalc/guide/rename_table.xhp|2 source/text/scalc/guide/text_numbers.xhp|2 source/text/schart/01/0403.xhp |8 - source/text/schart/01/0406.xhp |2 source/text/schart/02/0119.xhp |2 source/text/schart/02/0120.xhp |2 source/text/schart/main.xhp |2 source/text/sdraw/04/0102.xhp |4 source/text/sdraw/guide/text_enter.xhp |8 - source/text/sdraw/main0104.xhp |6 source/text/shared/00/0001.xhp | 34 ++-- source/text/shared/00/0021.xhp |2 source/text/shared/01/01100200.xhp | 12 - source/text/shared/01/01160300.xhp | 10 - source/text/shared/01/0210.xhp | 12 - source/text/shared/01/0211.xhp |2 source/text/shared/01/0211.xhp | 30 ++-- source/text/shared/01/02220100.xhp |2 source/text/shared/01/02230401.xhp | 28 +-- source/text/shared/01/0225.xhp | 12 - source/text/shared/01/05020200.xhp | 24 +-- source/text/shared/01/05030100.xhp | 32 ++-- source/text/shared/01/05030600.xhp | 22 +-- source/text/shared/01/05040100.xhp |4 source/text/shared/01/05040300.xhp | 18 +- source/text/shared/01/05040400.xhp |2 source/text/shared/01/05210300.xhp | 10 - source/text/shared/01/0522.xhp | 20 +- source/text/shared/01/05340100.xhp |2 source/text/shared/01/0601.xhp | 20 +- source/text/shared/01/0602.xhp | 12 - source/text/shared/01/06040100.xhp | 30 ++-- source/text/shared/01/06040600.xhp | 22 +-- source/text/shared/01/06050200.xhp |2 source/text/shared/01/06050500.xhp | 30 ++-- source/text/shared/01/06130200.xhp |2 source/text/shared/01/password_dlg.xhp |2 source/text/shared/02/0114.xhp | 26 +-- source/text/shared/02/01170101.xhp | 108 +++ source/text/shared/02/01170103.xhp | 28 +-- source/text/shared/02/01170202.xhp | 30 ++-- source/text/shared/02/0217.xhp |2 source/text/shared/02/0907.xhp |4 source/text/shared/
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdstr.hrc |5 +
svx/source/svdraw/svdstr.src | 22 --
2 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit b94f66ca986dd4405e227c031f8e039de07dab52
Author: Caolán McNamara
Date: Tue May 30 09:07:30 2017 +0100
missing resources
since
commit 17e872c3fa87bb596ec8b263b7a2e692b927dcef
Date: Fri Mar 17 13:11:27 2017 +0200
remove unused defines from HRC files in svx(1)
because SdrRectObj::TakeObjNamePlural adds some numbers to ids to find
other ones
Change-Id: I9d0bd3686f4a60b7436950f8e80def9cc3586d9c
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index 6051502f923c..a1168b708638 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -38,6 +38,11 @@
#define STR_ObjNamePluralLINE(STR_ObjNameBegin + 12)
#define STR_ObjNameSingulRECT(STR_ObjNameBegin + 13)
#define STR_ObjNamePluralRECT(STR_ObjNameBegin + 14)
+#define STR_ObjNamePluralQUAD(STR_ObjNameBegin + 16)
+#define STR_ObjNamePluralPARAL (STR_ObjNameBegin + 18)
+#define STR_ObjNamePluralRECTRND (STR_ObjNameBegin + 22)
+#define STR_ObjNamePluralQUADRND (STR_ObjNameBegin + 24)
+#define STR_ObjNamePluralPARALRND(STR_ObjNameBegin + 26)
#define STR_ObjNameSingulCIRC(STR_ObjNameBegin + 29)
#define STR_ObjNamePluralCIRC(STR_ObjNameBegin + 30)
#define STR_ObjNameSingulSECT(STR_ObjNameBegin + 31)
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 515528707fa2..036e8b0758a8 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -65,7 +65,6 @@ String STR_ObjNamePluralLINE
{
Text [ en-US ] = "Lines" ;
};
-
String STR_ObjNameSingulRECT
{
Text [ en-US ] = "Rectangle" ;
@@ -74,7 +73,26 @@ String STR_ObjNamePluralRECT
{
Text [ en-US ] = "Rectangles" ;
};
-
+String STR_ObjNamePluralQUAD
+{
+Text [ en-US ] = "Squares" ;
+};
+String STR_ObjNamePluralPARAL
+{
+Text [ en-US ] = "Parallelograms" ;
+};
+String STR_ObjNamePluralRECTRND
+{
+Text [ en-US ] = "Rounded Rectangles" ;
+};
+String STR_ObjNamePluralQUADRND
+{
+Text [ en-US ] = "Rounded Squares" ;
+};
+String STR_ObjNamePluralPARALRND
+{
+Text [ en-US ] = "Rounded parallelograms" ;
+};
String STR_ObjNameSingulCIRC
{
Text [ en-US ] = "Circle" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nutil/source
i18nutil/source/utility/paper.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3f9fbca3011fe4f8fd6d34fa6fe4644dbaf3d3a4
Author: Caolán McNamara
Date: Tue May 30 09:14:45 2017 +0100
coverity#1411565 'Constant' variable guards dead code
on incomplete fix of
commit 922e935c8812b1c1f94347bdbd7cdf277a75644e
Date: Mon May 29 17:08:06 2017 +0200
i18nutil: fix invalid string copy that prevents startup
for
commit ef513fd4b049b214a03fbe6e62a5ea43680a7a9b
Date: Fri May 26 10:58:42 2017 +0200
remove unnecessary use of OString::getStr
Change-Id: I6cc56bae5e4a5c2fb235663bc6676cdea02b9701
diff --git a/i18nutil/source/utility/paper.cxx
b/i18nutil/source/utility/paper.cxx
index 7e250024ebe4..d7c55a76eb1a 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -271,7 +271,8 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
if (ePaper == PAPER_USER)
{
-if (aPaper.startsWith("half"))
+bHalve = aPaper.startsWith("half");
+if (bHalve)
{
aPaper = aPaper.copy(4);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On 05/21/2017 01:22 PM, Chris Sherlock wrote:
[...]
some of them I just didn’t notice the message on
gerrit
[...]
I routinely add comments to already merged Gerrit changes, assuming that
authors and reviewers will see the corresponding mails Gerrit sends out
to them. If this is generally considered problematic, please let me know.
In terms of whitespacing causing issues in git archaeology, I thought
git had options to help with this sort of thing, so if that’s a major
issue then is there something stopping us from using this?
I don't think it's a major issue, just a minor nuisance (for stuff like
seemingly randomly changing " {" to "\n{"). But even minor nuisances
can pile up, and while git does have clever options to mitigate some of
this, you need to remember to use those options, etc.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: VclPtr tweaks post 5.4.2 ...
On 05/26/2017 11:23 AM, Michael Meeks wrote: s/ScopedVclPtr/VclPtrAutoDispose/g Unless we come up with a better name for the last sed; one suggestion was 'guard' but guards are released - not disposed; unsure if there is a similar UNO helper concept - Stephan ? Sorry, don't have a good idea here. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 28 commits - connectivity/source cui/source editeng/source extensions/source external/poppler filter/source forms/source formula/sour
connectivity/source/drivers/firebird/Table.cxx | 22 - cui/source/tabpages/tpbitmap.cxx | 32 +- editeng/source/editeng/impedit.cxx |1 editeng/source/editeng/impedit.hxx |4 editeng/source/editeng/impedit4.cxx |4 extensions/source/propctrlr/standardcontrol.cxx | 36 -- external/poppler/0001-really-disable-JPEG2000-import.patch.1 | 35 ++ external/poppler/UnpackedTarball_poppler.mk |1 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 14 forms/source/component/FormComponent.cxx | 12 formula/source/core/api/FormulaCompiler.cxx | 23 + icon-themes/sifr/cmd/lc_insertindexentry.png |binary icon-themes/sifr/cmd/lc_insertreferencefield.png |binary icon-themes/sifr/cmd/sc_insertindexentry.png |binary icon-themes/sifr/cmd/sc_insertreferencefield.png |binary include/formula/FormulaCompiler.hxx |2 include/vcl/commandevent.hxx | 10 include/vcl/window.hxx |2 sc/inc/document.hxx |1 sc/qa/unit/data/xlsb/tdf108017_calcProtection.xlsb |binary sc/qa/unit/subsequent_export-test.cxx| 37 +- sc/source/core/data/document.cxx |9 sc/source/core/tool/interpr1.cxx | 10 sc/source/filter/oox/worksheetsettings.cxx | 30 - sc/source/filter/orcus/orcusfiltersimpl.cxx | 17 - sc/source/ui/vba/vbarange.cxx|3 sdext/source/presenter/PresenterScrollBar.cxx|1 sdext/source/presenter/PresenterScrollBar.hxx|3 sdext/source/presenter/PresenterTextView.cxx |6 sdext/source/presenter/PresenterTextView.hxx |2 sdext/source/presenter/PresenterTimer.cxx| 99 +- sdext/source/presenter/PresenterTimer.hxx|2 svx/source/tbxctrls/tbcontrl.cxx |9 sw/inc/fchrfmt.hxx |6 sw/qa/extras/rtfimport/data/tdf106953.rtf| 23 + sw/qa/extras/rtfimport/rtfimport.cxx |9 sw/source/core/doc/docnew.cxx| 12 sw/source/core/para/paratr.cxx |1 sw/source/core/unocore/SwXTextDefaults.cxx |3 sw/source/core/unocore/unoobj.cxx|4 sw/source/core/unocore/unostyle.cxx |5 sw/source/filter/ww8/ww8par.cxx | 10 sw/source/uibase/app/apphdl.cxx |2 sw/source/uibase/docvw/edtwin.cxx|2 vcl/inc/salwtype.hxx |3 vcl/inc/unx/gtk/gtkframe.hxx | 10 vcl/source/gdi/pdfwriter_impl.cxx|5 vcl/source/opengl/OpenGLContext.cxx |3 vcl/source/window/commandevent.cxx |7 vcl/source/window/menu.cxx |2 vcl/source/window/syswin.cxx |2 vcl/source/window/window2.cxx| 14 vcl/source/window/winproc.cxx|2 vcl/unx/generic/window/salframe.cxx |1 vcl/unx/gtk/gtksalframe.cxx | 47 +-- vcl/unx/gtk3/gtk3gtkframe.cxx| 169 ++- vcl/win/window/salframe.cxx |1 writerfilter/source/rtftok/rtfsprm.cxx |5 xmlsecurity/qa/unit/pdfsigning/data/tdf107782.pdf|binary xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx| 20 + xmlsecurity/source/helper/pdfsignaturehelper.cxx |3 61 files changed, 554 insertions(+), 244 deletions(-) New commits: commit 2f3e56a26121927dfb941c74cafae82227cbcf8b Author: Julien Nabet Date: Thu May 25 10:14:30 2017 +0200 Related tdf#108068: Use new name of column when it's been changed First fix simple case, the rename of a column which is not a primary key Change-Id: Ia0de8e531021cbec0409408008c541c25a4bcd85 Reviewed-on: https://gerrit.libreoffice.org/38014 Tested-by: Jenkins (cherry picked from commit c751318868f3f0082b2c86df493216d452b8ecc5) Reviewed-on: https://gerrit.libreoffice.org/38023 Reviewed-by: Lionel Elie Mamane (cherry picked from commit 7b7c43f3c86eeeb7c092621464a74
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - scp2/source
scp2/source/ooo/folderitem_ooo.scp | 23 +++ 1 file changed, 23 insertions(+) New commits: commit 126e48d81cf46b295a1a4398e216bb4ebad07a27 Author: Andras Timar Date: Tue May 30 10:34:53 2017 +0200 Removing line from Shortcut table causes error with MSP patch Change-Id: Icdbdead756031be8ed3fac9f5a330d15c37ee6eb diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index ff8a371354da..3c0423bbb54f 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -65,3 +65,26 @@ FolderItemProperty gid_Fip_Soffice_Desktop_AppID Key = "System.AppUserModel.ID"; Value = "TheDocumentFoundation.LibreOffice.Startcenter"; End + +FolderItem gid_Folderitem_LibreOffice_SafeMode +Name = "%PRODUCTNAME (Safe Mode)"; +ModuleID = gid_Module_Root; +#ifdef ENABLE_SILENT_MSI +FolderID = PREDEFINED_STARTMENU; +#else +FolderID = gid_Folder_Staroffice51; +#endif +FileID = auto_brand_exe_soffice; +IconFile = auto_brand_exe_soffice; +IconID = 0; +WkDir = gid_Brand_Dir_Program; +Parameter = "--safe-mode"; +Styles = (NON_ADVERTISED); +ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE); +End + +FolderItemProperty gid_Fip_LibreOffice_SafeMode +ShortcutID = gid_Folderitem_LibreOffice_SafeMode; +Key = "System.AppUserModel.ID"; +Value = "TheDocumentFoundation.LibreOffice.SafeMode"; +End ___ 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 7db9fd0764dbd99c93b6fa7a368cce413f2a11da Author: Christian Lohmaier Date: Tue May 30 09:43:56 2017 +0200 Updated core Project: help 6e54fc4fe1c01d4b3b015b9074f0dc8d10257ee9 remove spurious spaces introduced in variables introduced on error when combining lines in eb145d19480d245228dc6b1032a925adbff8ea78 Change-Id: Ia0f5b7287689bea541c422c20b2d647b82c21b0b diff --git a/helpcontent2 b/helpcontent2 index 1ae135d75695..6e54fc4fe1c0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1ae135d7569571bc38fc1bcf0dfd24610039a86e +Subproject commit 6e54fc4fe1c01d4b3b015b9074f0dc8d10257ee9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/0003.xhp | 248 - 1 file changed, 124 insertions(+), 124 deletions(-) New commits: commit 6e54fc4fe1c01d4b3b015b9074f0dc8d10257ee9 Author: Christian Lohmaier Date: Tue May 30 09:43:56 2017 +0200 remove spurious spaces introduced in variables introduced on error when combining lines in eb145d19480d245228dc6b1032a925adbff8ea78 Change-Id: Ia0f5b7287689bea541c422c20b2d647b82c21b0b diff --git a/source/text/sbasic/shared/0003.xhp b/source/text/sbasic/shared/0003.xhp index 530de7268..47cd5d06d 100644 --- a/source/text/sbasic/shared/0003.xhp +++ b/source/text/sbasic/shared/0003.xhp @@ -42,10 +42,10 @@ - Color Value + Color Value - Color Name + Color Name @@ -186,131 +186,131 @@ -Error Codes +Error Codes -1 An exception occurred -2 Syntax error -3 Return without Gosub -4 Incorrect entry; please retry -5 Invalid procedure call -6 Overflow -7 Not enough memory -8 Array already dimensioned -9 Index out of defined range -10 Duplicate definition -11 Division by zero -12 Variable not defined -13 Data type mismatch -14 Invalid parameter -18 Process interrupted by user -20 Resume without error -28 Not enough stack memory -35 Sub-procedure or function procedure not defined -48 Error loading DLL file -49 Wrong DLL call convention -51 Internal error -52 Invalid file name or file number -53 File not found -54 Incorrect file mode -55 File already open -57 Device I/O error -58 File already exists -59 Incorrect record length -61 Disk or hard drive full -62 Reading exceeds EOF -63 Incorrect record number -67 Too many files -68 Device not available -70 Access denied -71 Disk not ready -73 Not implemented -74 Renaming on different drives impossible -75 Path/file access error -76 Path not found -91 Object variable not set -93 Invalid string pattern -94 Use of zero not permitted -250 DDE Error -280 Awaiting response to DDE connection -281 No DDE channels available -282 No application responded to DDE connect initiation -283 Too many applications responded to DDE connect initiation -284 DDE channel locked -285 External application cannot execute DDE operation -286 Timeout while waiting for DDE response -287 user pressed ESCAPE during DDE operation -288 External application busy -289 DDE operation without data -290 Data are in wrong format -291 External application has been terminated -292 DDE connection interrupted or modified -293 DDE method invoked with no channel open -294 Invalid DDE link format -295 DDE message has been lost -296 Paste link already performed -297 Link mode cannot be set due to invalid link topic -298 DDE requires the DDEML.DLL file -323 Module cannot be loaded; invalid format -341 Invalid object index -366 Object is not available -380 Incorrect property value -382 This property is read-only -394 This property is write-only -420 Invalid object reference -423 Property or method not found -424 Object required -425 Invalid use of an object -430 OLE Automation is not supported by this object -438 This property or method is not supported by the object -440 OLE automation error -445 This action is not supported by given object -446 Named arguments are not supported by given object -447 The current locale setting is not supported by the given object -448 Named argument not found -449 Argument is not optional -450 Invalid number of arguments -451 Object is not a list -452 Invalid ordinal number -453 Specified DLL function not found -460 Invalid clipboard format -951 Unexpected symbol: -952 Expected: -953 Symbol expected -954 Variable expected -955 Label expected -956 Value cannot be applied -957 Variable already defined -958 Sub procedure or function procedure already defined -959 Label already defined -960 Variable not found -961 Array or procedure not found -962 Procedure not found -963 Label undefined -964 Unknown data type -965 Exit expected -966 Statement block still open: missing -967 Parentheses do not match -968 Symbol already defined differently -969 Parameters do not correspond to procedure -970 Invalid character in number -971 Array must be dimensioned -972 Else/Endif without If -973 not allowed within a procedure -974 not allowed outside a procedure -975 Dimension specifications do not match -976 Unknown option: -977 Constant redefined -978 Program too large -979 Strings or arrays not permitted -1000 Object does not have this property -1001 Object does not have this method -1002 Required argument lacking -1003 Invalid number of arguments -1004 Error executing a method -1005 Unable to set property -1006 Unable to determine property +1 An exception occurred +2 Syntax error +3 Return without Gosub +4 Incorrect entry; please retry +5 Invalid procedure call +6 Overflow +7 Not enough memory +8 Array
[Libreoffice-commits] help.git: Branch 'libreoffice-5-4' - 2 commits - source/text
source/text/sbasic/shared/0003.xhp | 248 - source/text/shared/01/06010601.xhp | 11 + 2 files changed, 134 insertions(+), 125 deletions(-) New commits: commit 35eb7f229b9d244d5c215984f025a2b10a24d31b Author: Christian Lohmaier Date: Tue May 30 09:43:56 2017 +0200 remove spurious spaces introduced in variables introduced on error when combining lines in eb145d19480d245228dc6b1032a925adbff8ea78 Change-Id: Ia0f5b7287689bea541c422c20b2d647b82c21b0b (cherry picked from commit 6e54fc4fe1c01d4b3b015b9074f0dc8d10257ee9) Reviewed-on: https://gerrit.libreoffice.org/38200 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/source/text/sbasic/shared/0003.xhp b/source/text/sbasic/shared/0003.xhp index 530de7268..47cd5d06d 100644 --- a/source/text/sbasic/shared/0003.xhp +++ b/source/text/sbasic/shared/0003.xhp @@ -42,10 +42,10 @@ - Color Value + Color Value - Color Name + Color Name @@ -186,131 +186,131 @@ -Error Codes +Error Codes -1 An exception occurred -2 Syntax error -3 Return without Gosub -4 Incorrect entry; please retry -5 Invalid procedure call -6 Overflow -7 Not enough memory -8 Array already dimensioned -9 Index out of defined range -10 Duplicate definition -11 Division by zero -12 Variable not defined -13 Data type mismatch -14 Invalid parameter -18 Process interrupted by user -20 Resume without error -28 Not enough stack memory -35 Sub-procedure or function procedure not defined -48 Error loading DLL file -49 Wrong DLL call convention -51 Internal error -52 Invalid file name or file number -53 File not found -54 Incorrect file mode -55 File already open -57 Device I/O error -58 File already exists -59 Incorrect record length -61 Disk or hard drive full -62 Reading exceeds EOF -63 Incorrect record number -67 Too many files -68 Device not available -70 Access denied -71 Disk not ready -73 Not implemented -74 Renaming on different drives impossible -75 Path/file access error -76 Path not found -91 Object variable not set -93 Invalid string pattern -94 Use of zero not permitted -250 DDE Error -280 Awaiting response to DDE connection -281 No DDE channels available -282 No application responded to DDE connect initiation -283 Too many applications responded to DDE connect initiation -284 DDE channel locked -285 External application cannot execute DDE operation -286 Timeout while waiting for DDE response -287 user pressed ESCAPE during DDE operation -288 External application busy -289 DDE operation without data -290 Data are in wrong format -291 External application has been terminated -292 DDE connection interrupted or modified -293 DDE method invoked with no channel open -294 Invalid DDE link format -295 DDE message has been lost -296 Paste link already performed -297 Link mode cannot be set due to invalid link topic -298 DDE requires the DDEML.DLL file -323 Module cannot be loaded; invalid format -341 Invalid object index -366 Object is not available -380 Incorrect property value -382 This property is read-only -394 This property is write-only -420 Invalid object reference -423 Property or method not found -424 Object required -425 Invalid use of an object -430 OLE Automation is not supported by this object -438 This property or method is not supported by the object -440 OLE automation error -445 This action is not supported by given object -446 Named arguments are not supported by given object -447 The current locale setting is not supported by the given object -448 Named argument not found -449 Argument is not optional -450 Invalid number of arguments -451 Object is not a list -452 Invalid ordinal number -453 Specified DLL function not found -460 Invalid clipboard format -951 Unexpected symbol: -952 Expected: -953 Symbol expected -954 Variable expected -955 Label expected -956 Value cannot be applied -957 Variable already defined -958 Sub procedure or function procedure already defined -959 Label already defined -960 Variable not found -961 Array or procedure not found -962 Procedure not found -963 Label undefined -964 Unknown data type -965 Exit expected -966 Statement block still open: missing -967 Parentheses do not match -968 Symbol already defined differently -969 Parameters do not correspond to procedure -970 Invalid character in number -971 Array must be dimensioned -972 Else/Endif without If -973 not allowed within a procedure -974 not allowed outside a procedure -975 Dimension specifications do not match -976 Unknown option: -977 Constant redefined -978 Program too large -979 Strings or arrays not permitted -1000 Object does not have this property -1001 Object does not have this method -1002 Required argument lacking -1003 Invalid number of arguments -1004 Error exe
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - 4 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3134e5eef4709aa4237e1ea31a31f35c0ef721c Author: Gabor Kelemen Date: Mon May 22 21:39:47 2017 +0200 Updated core Project: help 6826dc9d462ecaa54a317c51c06aba2d411bc122 Convert bogus head2 roles to "heading level 2" roles Change-Id: I911bcf79b2ce0f0d8812f8756260861b95624b3b Reviewed-on: https://gerrit.libreoffice.org/37932 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 3106a05e988e7ed831840b47e8ecbf2961d34d94) Reviewed-on: https://gerrit.libreoffice.org/38193 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 59f6a46cb49e..6826dc9d462e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 59f6a46cb49eb4c7247bfee8db9d533c6b17b7dc +Subproject commit 6826dc9d462ecaa54a317c51c06aba2d411bc122 commit 6b38fff626444dc5b0452efd83cb7b98b74d04d6 Author: Gabor Kelemen Date: Fri May 19 00:37:31 2017 +0200 Updated core Project: help 59f6a46cb49eb4c7247bfee8db9d533c6b17b7dc Remove an empty page Styles A comment said "to be deleted" :) Change-Id: I025701664b7b8c6d1691941393a09bd72b43a1b7 Reviewed-on: https://gerrit.libreoffice.org/37931 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 2c1173b8ad3225b52e51545b6339a0fe7b9dc577) Reviewed-on: https://gerrit.libreoffice.org/38192 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index c7d543eee812..59f6a46cb49e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c7d543eee812b974cee11e0d7766af56d54dfafe +Subproject commit 59f6a46cb49eb4c7247bfee8db9d533c6b17b7dc commit b7968836e0922aaef013f09574e3c0db05b2d2e1 Author: Gabor Kelemen Date: Fri May 19 00:14:31 2017 +0200 Updated core Project: help c7d543eee812b974cee11e0d7766af56d54dfafe Drop an obsolete and a redundant bookmark Change-Id: I80b0d269def0dc700e6f6da6c76502d78f30fac4 Reviewed-on: https://gerrit.libreoffice.org/37930 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit ead4207b4a6f7ae49ecf9b80a598ecd0fafe7304) Reviewed-on: https://gerrit.libreoffice.org/38191 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 533edb4dda97..c7d543eee812 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 533edb4dda97c6630ee5329627dc63afedf4b5a2 +Subproject commit c7d543eee812b974cee11e0d7766af56d54dfafe commit 0dcee8ed12f5769cee004cc0f39217611b515b70 Author: Gabor Kelemen Date: Fri May 19 00:09:35 2017 +0200 Updated core Project: help 533edb4dda97c6630ee5329627dc63afedf4b5a2 tdf#107229 Fix reference to the Save as Template menu item Drop bookmark and ahelp related to old OOo template manager window Also fix a reference to the Styles and Formatting sidebar Change-Id: Icfe056ee32e38b45f11f33b65f85c24b05a32107 Reviewed-on: https://gerrit.libreoffice.org/37929 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 98f16894574b039fc5e7ead6934aa4a0488472b0) Reviewed-on: https://gerrit.libreoffice.org/38190 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index c75dbcd8364d..533edb4dda97 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c75dbcd8364d8f443465d4c9b2461356a6b89869 +Subproject commit 533edb4dda97c6630ee5329627dc63afedf4b5a2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - 5 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 774f61bfb09d3ff21accd49e100e21c256737a65 Author: Gabor Kelemen Date: Tue May 30 08:16:46 2017 +0200 Updated core Project: help abc932000dba2965239cc24433088303f89a4aa4 Fix ahelps and bookmarks on X/Y Error Bars page Change-Id: Ic551d68721a5c045e62f279add57942ea7a879cb Reviewed-on: https://gerrit.libreoffice.org/38177 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 29eb53b6fffb2620dd32860c6d9093dfa5c11dcd) Reviewed-on: https://gerrit.libreoffice.org/38198 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 0e0e84cef9ac..abc932000dba 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0e0e84cef9acfc4b80cd89cb1b20460552e20df9 +Subproject commit abc932000dba2965239cc24433088303f89a4aa4 commit c178dc26266962f10129bb88b0690337b20d52ed Author: Gabor Kelemen Date: Tue May 23 23:55:59 2017 +0200 Updated core Project: help 0e0e84cef9acfc4b80cd89cb1b20460552e20df9 PlaceWare filter was dropped so don't mention its format Change-Id: Ifdfc7ca4de9565f69d8e14b91e219044e5ebd7f8 Reviewed-on: https://gerrit.libreoffice.org/37968 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 9c0f31652cb806846bad8f814006209489c58b6b) Reviewed-on: https://gerrit.libreoffice.org/38197 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 0851ba9c0354..0e0e84cef9ac 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0851ba9c035482160b435530ef7f8150978be0dc +Subproject commit 0e0e84cef9acfc4b80cd89cb1b20460552e20df9 commit a6f490f0151e81519d8914197c8b89b7508d61dc Author: Gabor Kelemen Date: Tue May 23 07:35:55 2017 +0200 Updated core Project: help 0851ba9c035482160b435530ef7f8150978be0dc tdf#102930 Fix missing ahelp Change-Id: Idc360a4e6fd1c13a1e640121159d1227d7feb601 Reviewed-on: https://gerrit.libreoffice.org/37935 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 78931b6027223617d44a209378c88161345eb21d) Reviewed-on: https://gerrit.libreoffice.org/38196 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 8745d40e9880..0851ba9c0354 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8745d40e9880f07f0914a728a8be03a44383a5c7 +Subproject commit 0851ba9c035482160b435530ef7f8150978be0dc commit 387f6485114eda59ad1d04572c07277a547ba4f4 Author: Gabor Kelemen Date: Mon May 22 22:28:37 2017 +0200 Updated core Project: help 8745d40e9880f07f0914a728a8be03a44383a5c7 Fix more bookmarks one ahelp on the track changes Filter page Here we need the magic dot as ahelp id Change-Id: I9991afeae940a0bf0415118353dde8de3d68eede Reviewed-on: https://gerrit.libreoffice.org/37934 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 9cafc343bfe9c3c4e3edd29cfc14da2ebbe895c3) Reviewed-on: https://gerrit.libreoffice.org/38195 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 75bd2a929adf..8745d40e9880 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 75bd2a929adff8125299705be9fabc044efa9e2e +Subproject commit 8745d40e9880f07f0914a728a8be03a44383a5c7 commit 5eb9576fea89f6d107893375c0c4d2b17c460dd7 Author: Gabor Kelemen Date: Mon May 22 22:27:09 2017 +0200 Updated core Project: help 75bd2a929adff8125299705be9fabc044efa9e2e Change bogus paragraph role relatedtopics to paragraph Change-Id: I561cceb2579abf01c3239304dd9aba88235545e6 Reviewed-on: https://gerrit.libreoffice.org/37933 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit bb6df706e558e0a8a617541352b11fc075d20f03) Reviewed-on: https://gerrit.libreoffice.org/38194 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 6826dc9d462e..75bd2a929adf 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6826dc9d462ecaa54a317c51c06aba2d411bc122 +Subproject commit 75bd2a929adff8125299705be9fabc044efa9e2e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit befb7718523d8094ed2e0c5b370cd48cb0c2350a Author: Christian Lohmaier Date: Tue May 30 09:43:56 2017 +0200 Updated core Project: help 35eb7f229b9d244d5c215984f025a2b10a24d31b remove spurious spaces introduced in variables introduced on error when combining lines in eb145d19480d245228dc6b1032a925adbff8ea78 Change-Id: Ia0f5b7287689bea541c422c20b2d647b82c21b0b (cherry picked from commit 6e54fc4fe1c01d4b3b015b9074f0dc8d10257ee9) Reviewed-on: https://gerrit.libreoffice.org/38200 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index 6ea7d65946fe..35eb7f229b9d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6ea7d65946fe4d6b9c09b5aea47469335038956b +Subproject commit 35eb7f229b9d244d5c215984f025a2b10a24d31b commit caea6300e4109ca25e4beb592f6824eefd1bcf66 Author: Gabor Kelemen Date: Tue May 30 08:17:51 2017 +0200 Updated core Project: help 6ea7d65946fe4d6b9c09b5aea47469335038956b Add missing bookmarks to Edit Dictionary page Change-Id: I1ecee4903c2216f12a64798b9f0e49f27ae81804 Reviewed-on: https://gerrit.libreoffice.org/38178 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 45f6f1757199dbebd364de8d2e1964e59d0c6f1f) Reviewed-on: https://gerrit.libreoffice.org/38199 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index abc932000dba..6ea7d65946fe 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit abc932000dba2965239cc24433088303f89a4aa4 +Subproject commit 6ea7d65946fe4d6b9c09b5aea47469335038956b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-5-4' - 9 commits - AllLangHelp_swriter.mk source/text
AllLangHelp_swriter.mk |1 source/text/schart/01/0405.xhp | 55 +++ source/text/shared/00/0200.xhp |2 source/text/shared/01/02230200.xhp |2 source/text/shared/01/02230402.xhp | 12 ++--- source/text/shared/01/digitalsignatures.xhp |2 source/text/shared/guide/macro_recording.xhp |2 source/text/shared/main0212.xhp |6 +- source/text/shared/optionen/mailmerge.xhp|2 source/text/swriter/01/0513.xhp |8 +-- source/text/swriter/01/0599.xhp | 37 -- 11 files changed, 56 insertions(+), 73 deletions(-) New commits: commit abc932000dba2965239cc24433088303f89a4aa4 Author: Gabor Kelemen Date: Tue May 30 08:16:46 2017 +0200 Fix ahelps and bookmarks on X/Y Error Bars page Change-Id: Ic551d68721a5c045e62f279add57942ea7a879cb Reviewed-on: https://gerrit.libreoffice.org/38177 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen (cherry picked from commit 29eb53b6fffb2620dd32860c6d9093dfa5c11dcd) Reviewed-on: https://gerrit.libreoffice.org/38198 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/source/text/schart/01/0405.xhp b/source/text/schart/01/0405.xhp index d8097cbaf..69b54d075 100644 --- a/source/text/schart/01/0405.xhp +++ b/source/text/schart/01/0405.xhp @@ -44,19 +44,15 @@ None -Does not show any error bars. +Does not show any error bars. - - - - Constant value -Displays constant values that you specify in the Parameters area. +Displays constant values that you specify in the Parameters area. Percentage -Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area. +Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area. @@ -64,22 +60,49 @@ Functions Select a function to calculate the error bars. Standard Error: Displays the standard error. -Variance: Displays the variance calculated from the number of data points and respective values. -Standard Deviation: Displays the standard deviation (square root of the variance). Unlike other functions, error bars are centered on the mean. -Error Margin: Displays the highest error margin in percent according to the highest value of the data group. Set the percentage in the Parameters area. +Variance: Displays the variance calculated from the number of data points and respective values. +Standard Deviation: Displays the standard deviation (square root of the variance). Unlike other functions, error bars are centered on the mean. +Error Margin: Displays the highest error margin in percent according to the highest value of the data group. Set the percentage in the Parameters area. + + + Cell Range Click Cell Range and then specify a cell range from which to take the positive and negative error bar values. + + + + Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size. + From Data Table -For a chart with its own data, the error bar values can be entered in the chart data table. The Data Table dialog shows additional columns titled Positive X or Y-Error-Bars and Negative X or Y-Error-Bars.Positive (+) -Enter the value to add to the displayed value as the positive error value.Negative (-) -Enter the value to subtract from the displayed value as the negative error value.Positive (+) when Cell Range is selected -Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet.Negative (-) when Cell Range is selected +For a chart with its own data, the error bar values can be entered in the chart data table. The Data Table dialog shows additional columns titled Positive X or Y-Error-Bars and Negative X or Y-Error-Bars. + +Positive (+) + + +Enter the value to add to the displayed value as the positive error value. + +Negative (-) + + +Enter the value to subtract from the displayed value as the negative error value. + +Positive (+) when Cell Range is selected + + +Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet. + +Negative (-) when Cell Range is selected + + Enter the address range from where to get the negative error values. Use the Shrink button to select the range from a sheet. + + + Same value for both Enable to use the positive error values also as negative error values. You can only change the value of the "Positve (+)" box. That value gets copied to the "Negative (-)" box automatically. -Error indicator -Specifies the error indicator. +Error Indicator +Specifies the error indicator. Positive and Negative commit 0e0e84cef9acfc4b80cd89cb1b20460552e20df9 Auth
[Libreoffice-commits] core.git: 2 commits - sw/qa vcl/source vcl/unx
sw/qa/extras/tiledrendering/tiledrendering.cxx | 18 --
vcl/source/app/svmain.cxx | 11 +++
vcl/unx/gtk/gtkinst.cxx|6 --
3 files changed, 23 insertions(+), 12 deletions(-)
New commits:
commit f55eeb7a45998d16eb0fe49088e172ce45ac4f2b
Author: Caolán McNamara
Date: Tue May 30 09:44:43 2017 +0100
make LANGUAGE setting universal, not just gtk specific
Change-Id: I5ff01f0232391933ad3704af6f2c2100d923c1fd
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 2a89d80f60f3..0e0a2a9bbbff 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -318,6 +318,17 @@ bool InitVCL()
// soffice/sfx implementation creates the global service manager
pSVData->mpApp->Init();
+//Now that uno has been bootstrapped we can ask the config what the UI
language is so that we can
+//force that in as $LANGUAGE. That way we can get gtk to render widgets RTL
+//if we have a RTL UI in an otherwise LTR locale and get gettext using
externals (e.g. python)
+//to match their translations to our preferred UI language
+OUString
aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(".UTF-8"));
+if (!aLocaleString.isEmpty())
+{
+OUString envVar("LANGUAGE");
+osl_setEnvironment(envVar.pData, aLocaleString.pData);
+}
+
pSVData->mpDefInst->AfterAppInit();
// Fetch AppFileName and make it absolute before the workdir changes...
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index e01a267b6131..a22ea9c93f87 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -167,12 +167,6 @@ GtkInstance::GtkInstance( SalYieldMutex* pMutex )
//UI in a LTR locale
void GtkInstance::AfterAppInit()
{
-OUString
aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(".UTF-8"));
-if (!aLocaleString.isEmpty())
-{
-OUString envVar("LANGUAGE");
-osl_setEnvironment(envVar.pData, aLocaleString.pData);
-}
EnsureInit();
}
commit 1c965f6aec81816170aaf8f9fa378ab6adcb91af
Author: Caolán McNamara
Date: Tue May 30 09:20:21 2017 +0100
coverity#1411566 Unchecked dynamic_cast
and
coverity#1411567 Unchecked dynamic_cast
coverity#1411568 Unchecked dynamic_cast
coverity#1411569 Unchecked dynamic_cast
Change-Id: If1bb74941f2571ec3bdcb705bf2c9a87b54fe78d
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 22d010796da9..38e131f0b8b8 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1734,10 +1734,12 @@ void SwTiledRenderingTest::testDisableUndoRepair()
SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
ViewCallback aView1;
SwView* pView1 = dynamic_cast(SfxViewShell::Current());
+CPPUNIT_ASSERT(pView1);
int nView1 = SfxLokHelper::getView();
SfxLokHelper::createView();
ViewCallback aView2;
SwView* pView2 = dynamic_cast(SfxViewShell::Current());
+CPPUNIT_ASSERT(pView2);
int nView2 = SfxLokHelper::getView();
{
@@ -1756,12 +1758,14 @@ void SwTiledRenderingTest::testDisableUndoRepair()
// first view, undo enabled
pView1->GetState(aItemSet1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet1.GetItemState(SID_UNDO));
-CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item *
>(aItemSet1.GetItem(SID_UNDO)));
+const SfxUInt32Item *pUnsetItem = dynamic_cast(aItemSet1.GetItem(SID_UNDO));
+CPPUNIT_ASSERT(!pUnsetItem);
// second view, undo conflict
pView2->GetState(aItemSet2);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet2.GetItemState(SID_UNDO));
-CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item *
>(aItemSet2.GetItem(SID_UNDO)));
-CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT),
dynamic_cast< const SfxUInt32Item * >(aItemSet2.GetItem(SID_UNDO))->GetValue());
+const SfxUInt32Item *pSetItem = dynamic_cast(aItemSet2.GetItem(SID_UNDO));
+CPPUNIT_ASSERT(pSetItem);
+CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT),
pSetItem->GetValue());
};
// Insert a character in the first view.
@@ -1782,12 +1786,14 @@ void SwTiledRenderingTest::testDisableUndoRepair()
// second view, undo enabled
pView2->GetState(aItemSet2);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet2.GetItemState(SID_UNDO));
-CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item *
>(aItemSet2.GetItem(SID_UNDO)));
+const SfxUInt32Item *pUnsetItem = dynamic_cast(aItemSet2.GetItem(SID_UNDO));
+CPPUNIT_ASSERT(!pUnsetItem);
// first view, undo conflict
pView1->GetState(aItemSet1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet1.GetItemState(SID_UNDO));
-CPP
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/ftp/ftpurl.cxx | 81 +-
1 file changed, 41 insertions(+), 40 deletions(-)
New commits:
commit deae9e88b960130f384f424ec8fce60a3d4e6297
Author: Noel Grandin
Date: Tue May 30 10:03:40 2017 +0200
FTPURL::parse doesn't need so much string conversion
just do all the work on an OUString
Change-Id: Id8c03203dd793fa9351d0d4d46a7726bafd7d814
Reviewed-on: https://gerrit.libreoffice.org/38183
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index dd26810769c0..89a44774799e 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include "ftpurl.hxx"
#include "ftpcontentprovider.hxx"
@@ -142,27 +143,25 @@ FTPURL::~FTPURL()
void FTPURL::parse(const OUString& url)
{
-OUString aPassword,aAccount;
-OString aIdent(url.getStr(),
-url.getLength(),
-RTL_TEXTENCODING_UTF8);
-
-OString lower = aIdent.toAsciiLowerCase();
-if(lower.getLength() < 6 ||
- strncmp("ftp://",lower.getStr(),6))
-throw malformed_exception();
-
-std::unique_ptr buffer(new char[1+aIdent.getLength()]);
-const char* p2 = aIdent.getStr();
-p2 += 6;
+OUString aPassword, urlRest;
-char ch;
-char *p1 = buffer.get(); // determine "username:password@host:port"
-while((ch = *p2++) != '/' && ch)
-*p1++ = ch;
-*p1 = 0;
+if(url.getLength() < 6 || !url.startsWithIgnoreAsciiCase("ftp://";))
+throw malformed_exception();
+urlRest = url.copy(6);
-OUString aExpr(buffer.get(), strlen(buffer.get()), RTL_TEXTENCODING_UTF8);
+// determine "username:password@host:port"
+OUString aExpr;
+sal_Int32 nIdx = urlRest.indexOf('/');
+if (nIdx == -1)
+{
+aExpr = urlRest;
+urlRest = "";
+}
+else
+{
+aExpr = urlRest.copy(0, nIdx);
+urlRest = urlRest.copy(nIdx + 1);
+}
sal_Int32 l = aExpr.indexOf('@');
m_aHost = aExpr.copy(1+l);
@@ -177,7 +176,7 @@ void FTPURL::parse(const OUString& url)
m_bShowPassword = true;
}
if(l > 0)
-// Overwritte only if the username is not empty.
+// Overwritten only if the username is not empty.
m_aUsername = aExpr.copy(0,l);
else if(!aExpr.isEmpty())
m_aUsername = aExpr;
@@ -195,34 +194,36 @@ void FTPURL::parse(const OUString& url)
m_aHost = m_aHost.copy(0,l);
}
-while(ch) { // now determine the pathsegments ...
-p1 = buffer.get();
-while((ch = *p2++) != '/' && ch)
-*p1++ = ch;
-*p1 = 0;
-
-if(buffer[0]) {
-if( strcmp(buffer.get(),"..") == 0 && !m_aPathSegmentVec.empty()
&& m_aPathSegmentVec.back() != ".." )
-m_aPathSegmentVec.pop_back();
-else if(strcmp(buffer.get(),".") == 0)
-; // Ignore
-else
-// This is a legal name.
-m_aPathSegmentVec.push_back(
-OUString(buffer.get(),
- strlen(buffer.get()),
- RTL_TEXTENCODING_UTF8));
+// now determine the pathsegments ...
+while(!urlRest.isEmpty())
+{
+nIdx = urlRest.indexOf('/');
+OUString segment;
+if(nIdx == -1)
+{
+segment = urlRest;
+urlRest = "";
+}
+else
+{
+segment = urlRest.copy(0, nIdx);
+urlRest = urlRest.copy(nIdx + 1);
}
+if( segment == ".." && !m_aPathSegmentVec.empty() &&
m_aPathSegmentVec.back() != ".." )
+m_aPathSegmentVec.pop_back();
+else if( segment == "." )
+; // Ignore
+else
+// This is a legal name.
+m_aPathSegmentVec.push_back( segment );
}
-buffer.reset();
-
if(m_bShowPassword)
m_pFCP->setHost(m_aHost,
m_aPort,
m_aUsername,
aPassword,
-aAccount);
+""/*aAccount*/);
// now check for something like ";type=i" at end of url
if(m_aPathSegmentVec.size() &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - include/svx svx/source
include/svx/svdstr.hrc |5 +
svx/source/svdraw/svdstr.src | 22 --
2 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit af76aebd44789dd206d0931361bbb4874463c3b8
Author: Caolán McNamara
Date: Tue May 30 09:07:30 2017 +0100
missing resources
since
commit 17e872c3fa87bb596ec8b263b7a2e692b927dcef
Date: Fri Mar 17 13:11:27 2017 +0200
remove unused defines from HRC files in svx(1)
because SdrRectObj::TakeObjNamePlural adds some numbers to ids to find
other ones
Change-Id: I9d0bd3686f4a60b7436950f8e80def9cc3586d9c
(cherry picked from commit b94f66ca986dd4405e227c031f8e039de07dab52)
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index 6051502f923c..a1168b708638 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -38,6 +38,11 @@
#define STR_ObjNamePluralLINE(STR_ObjNameBegin + 12)
#define STR_ObjNameSingulRECT(STR_ObjNameBegin + 13)
#define STR_ObjNamePluralRECT(STR_ObjNameBegin + 14)
+#define STR_ObjNamePluralQUAD(STR_ObjNameBegin + 16)
+#define STR_ObjNamePluralPARAL (STR_ObjNameBegin + 18)
+#define STR_ObjNamePluralRECTRND (STR_ObjNameBegin + 22)
+#define STR_ObjNamePluralQUADRND (STR_ObjNameBegin + 24)
+#define STR_ObjNamePluralPARALRND(STR_ObjNameBegin + 26)
#define STR_ObjNameSingulCIRC(STR_ObjNameBegin + 29)
#define STR_ObjNamePluralCIRC(STR_ObjNameBegin + 30)
#define STR_ObjNameSingulSECT(STR_ObjNameBegin + 31)
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 515528707fa2..036e8b0758a8 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -65,7 +65,6 @@ String STR_ObjNamePluralLINE
{
Text [ en-US ] = "Lines" ;
};
-
String STR_ObjNameSingulRECT
{
Text [ en-US ] = "Rectangle" ;
@@ -74,7 +73,26 @@ String STR_ObjNamePluralRECT
{
Text [ en-US ] = "Rectangles" ;
};
-
+String STR_ObjNamePluralQUAD
+{
+Text [ en-US ] = "Squares" ;
+};
+String STR_ObjNamePluralPARAL
+{
+Text [ en-US ] = "Parallelograms" ;
+};
+String STR_ObjNamePluralRECTRND
+{
+Text [ en-US ] = "Rounded Rectangles" ;
+};
+String STR_ObjNamePluralQUADRND
+{
+Text [ en-US ] = "Rounded Squares" ;
+};
+String STR_ObjNamePluralPARALRND
+{
+Text [ en-US ] = "Rounded parallelograms" ;
+};
String STR_ObjNameSingulCIRC
{
Text [ en-US ] = "Circle" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/Storage.cpp wsd/Storage.hpp
wsd/ClientSession.hpp |7 +++
wsd/DocumentBroker.cpp | 29 -
wsd/Storage.cpp|8
wsd/Storage.hpp|4 ++--
4 files changed, 29 insertions(+), 19 deletions(-)
New commits:
commit 79ac43be8d385675fc157f9bbff063d5ebb0c4da
Author: Pranav Kant
Date: Tue Dec 13 14:43:58 2016 +0530
wsd: Store wopifileinfo separately per client session
Client needs to act accordingly as per permissions/settings set
by the WOPI host.
(cherry picked from commit 3e2a9df6dd0eb44958875d9f443c5c3fe0b96698)
Reviewed-on: https://gerrit.libreoffice.org/32169
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
Change-Id: I7c9f311be50d4aff2562da0cfef2fff889f111d0
Reviewed-on: https://gerrit.libreoffice.org/37996
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 37035936..f7febe51 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -11,6 +11,7 @@
#define INCLUDED_CLIENTSSESSION_HPP
#include "Session.hpp"
+#include "Storage.hpp"
#include "MessageQueue.hpp"
#include
@@ -64,6 +65,9 @@ public:
/// client made the request to us
const Poco::URI& getPublicUri() const { return _uriPublic; }
+/// Set WOPI fileinfo object
+void setWopiFileInfo(std::unique_ptr&
wopiFileInfo) { _wopiFileInfo = std::move(wopiFileInfo); }
+
private:
virtual bool _handleInput(const char* buffer, int length) override;
@@ -110,6 +114,9 @@ private:
MessageQueue _saveAsQueue;
int _loadPart;
+
+/// Wopi FileInfo object
+std::unique_ptr _wopiFileInfo;
};
#endif
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 49873008..78f64059 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -248,11 +248,11 @@ bool DocumentBroker::load(std::shared_ptr&
session, const std::st
std::chrono::duration getInfoCallDuration(0);
if (dynamic_cast(_storage.get()) != nullptr)
{
-const WopiStorage::WOPIFileInfo wopifileinfo =
static_cast(_storage.get())->getWOPIFileInfo(uriPublic);
-userid = wopifileinfo._userid;
-username = wopifileinfo._username;
+std::unique_ptr wopifileinfo =
static_cast(_storage.get())->getWOPIFileInfo(uriPublic);
+userid = wopifileinfo->_userid;
+username = wopifileinfo->_username;
-if (!wopifileinfo._userCanWrite)
+if (!wopifileinfo->_userCanWrite)
{
LOG_DBG("Setting the session as readonly");
session->setReadOnly();
@@ -260,14 +260,14 @@ bool DocumentBroker::load(std::shared_ptr&
session, const std::st
// Construct a JSON containing relevant WOPI host properties
Object::Ptr wopiInfo = new Object();
-if (!wopifileinfo._postMessageOrigin.empty())
+if (!wopifileinfo->_postMessageOrigin.empty())
{
-wopiInfo->set("PostMessageOrigin",
wopifileinfo._postMessageOrigin);
+wopiInfo->set("PostMessageOrigin",
wopifileinfo->_postMessageOrigin);
}
-wopiInfo->set("HidePrintOption", wopifileinfo._hidePrintOption);
-wopiInfo->set("HideSaveOption", wopifileinfo._hideSaveOption);
-wopiInfo->set("HideExportOption", wopifileinfo._hideExportOption);
+wopiInfo->set("HidePrintOption", wopifileinfo->_hidePrintOption);
+wopiInfo->set("HideSaveOption", wopifileinfo->_hideSaveOption);
+wopiInfo->set("HideExportOption", wopifileinfo->_hideExportOption);
std::ostringstream ossWopiInfo;
wopiInfo->stringify(ossWopiInfo);
@@ -280,13 +280,16 @@ bool DocumentBroker::load(std::shared_ptr&
session, const std::st
session->setDocumentOwner(true);
}
-getInfoCallDuration = wopifileinfo._callDuration;
+getInfoCallDuration = wopifileinfo->_callDuration;
+
+// Pass the ownership to client session
+session->setWopiFileInfo(wopifileinfo);
}
else if (dynamic_cast(_storage.get()) != nullptr)
{
-const LocalStorage::LocalFileInfo localfileinfo =
static_cast(_storage.get())->getLocalFileInfo(uriPublic);
-userid = localfileinfo._userid;
-username = localfileinfo._username;
+std::unique_ptr localfileinfo =
static_cast(_storage.get())->getLocalFileInfo(uriPublic);
+userid = localfileinfo->_userid;
+username = localfileinfo->_username;
}
LOG_DBG("Setting username [" << username << "] and userId [" << userid <<
"] for session [" << sessionId << "]");
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index b9df6b2e..c54eceb3 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -186,7 +186,7 @@ std::unique_ptr StorageBase::create(const
Poco::URI& uri, const std
std::atomic LocalStorage::LastLocalStorageId;
-LocalStorage::LocalFileInfo LocalStorage::getLocalFileInfo(const Poco::URI&
uriPublic)
+std::unique_ptr
LocalStor
Conference Program Committee
Hi all, The program committee is currently composed with Marina, Thorsten and Italo, does one of you with technical skills would be willing to be part of it? Note that you should be available during July and August where the votes will take place. Thanks a lot in advance, Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org GSM: +33683901545 IRC: sophi Release coordinator The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - 2 commits - dbaccess/source include/svx svx/source
dbaccess/source/ui/tabledesign/TableController.cxx |3 +
include/svx/svdstr.hrc |9 +
svx/source/svdraw/svdstr.src | 36 +
3 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit a987fd3b320b02705d9b5239040024c03af5476f
Author: Julien Nabet
Date: Thu May 25 23:17:31 2017 +0200
Related tdf#108068: Retrieve error from Firebird engine
Change-Id: If89a904740e54e81c2f2ae790ba8d05d830b0a5b
Reviewed-on: https://gerrit.libreoffice.org/38043
Tested-by: Jenkins
(cherry picked from commit 182a62e0f199d26df0ae76ebf224c5d4b0fc3e26)
Reviewed-on: https://gerrit.libreoffice.org/38179
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 68ec90e114b1..2da0d3c63ff3 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1117,12 +1117,13 @@ void OTableController::alterColumns()
}
catch(const SQLException&)
{ // we couldn't alter the column so we have to add new columns
+SQLExceptionInfo aError( ::cppu::getCaughtException() );
bReload = true;
if(xDrop.is() && xAppend.is())
{
OUString aMessage(ModuleRes(STR_TABLEDESIGN_ALTER_ERROR));
aMessage =
aMessage.replaceFirst("$column$",pField->GetName());
-ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(),
aMessage, WB_YES_NO | WB_DEF_YES );
+ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(),
aMessage, WB_YES_NO | WB_DEF_YES, &aError);
if ( aMsg->Execute() != RET_YES )
{
Reference
xNewColumn(xIdxColumns->getByIndex(nPos),UNO_QUERY_THROW);
commit 7c4298dc3ffc363d3bc9b3c880bf544c8c669746
Author: Caolán McNamara
Date: Tue May 30 10:15:20 2017 +0100
missing resources
since
commit 17e872c3fa87bb596ec8b263b7a2e692b927dcef
Date: Fri Mar 17 13:11:27 2017 +0200
remove unused defines from HRC files in svx(1)
because SdrRectObj::TakeObjNameSingul adds some numbers to ids to find
other ones
Change-Id: I9d0bd3686f4a60b7436950f8e80def9cc3586d9c
(cherry picked from commit e29150c307e65b931f6cbfed3e75c9475ab9ecd8)
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index a1168b708638..90163609b02f 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -38,11 +38,20 @@
#define STR_ObjNamePluralLINE(STR_ObjNameBegin + 12)
#define STR_ObjNameSingulRECT(STR_ObjNameBegin + 13)
#define STR_ObjNamePluralRECT(STR_ObjNameBegin + 14)
+#define STR_ObjNameSingulQUAD(STR_ObjNameBegin + 15)
#define STR_ObjNamePluralQUAD(STR_ObjNameBegin + 16)
+#define STR_ObjNameSingulPARAL (STR_ObjNameBegin + 17)
#define STR_ObjNamePluralPARAL (STR_ObjNameBegin + 18)
+#define STR_ObjNameSingulRAUTE (STR_ObjNameBegin + 19)
+#define STR_ObjNamePluralRAUTE (STR_ObjNameBegin + 20)
+#define STR_ObjNameSingulRECTRND (STR_ObjNameBegin + 21)
#define STR_ObjNamePluralRECTRND (STR_ObjNameBegin + 22)
+#define STR_ObjNameSingulQUADRND (STR_ObjNameBegin + 23)
#define STR_ObjNamePluralQUADRND (STR_ObjNameBegin + 24)
+#define STR_ObjNameSingulPARALRND(STR_ObjNameBegin + 25)
#define STR_ObjNamePluralPARALRND(STR_ObjNameBegin + 26)
+#define STR_ObjNameSingulRAUTERND(STR_ObjNameBegin + 27)
+#define STR_ObjNamePluralRAUTERND(STR_ObjNameBegin + 28)
#define STR_ObjNameSingulCIRC(STR_ObjNameBegin + 29)
#define STR_ObjNamePluralCIRC(STR_ObjNameBegin + 30)
#define STR_ObjNameSingulSECT(STR_ObjNameBegin + 31)
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 036e8b0758a8..d704475e0297 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -73,26 +73,62 @@ String STR_ObjNamePluralRECT
{
Text [ en-US ] = "Rectangles" ;
};
+String STR_ObjNameSingulQUAD
+{
+Text [ en-US ] = "Square" ;
+};
String STR_ObjNamePluralQUAD
{
Text [ en-US ] = "Squares" ;
};
+String STR_ObjNameSingulPARAL
+{
+Text [ en-US ] = "Parallelogram" ;
+};
String STR_ObjNamePluralPARAL
{
Text [ en-US ] = "Parallelograms" ;
};
+String STR_ObjNameSingulRAUTE
+{
+Text [ en-US ] = "Rhombus" ;
+};
+String STR_ObjNamePluralRAUTE
+{
+Text [ en-US ] = "Rhombuses" ;
+};
+String STR_ObjNameSingulRECTRND
+{
+Text [ en-US ] = "Rounded rectangle" ;
+};
String STR_ObjNamePluralRECTRND
{
Text [ en-US ] = "Rounded Rectangles" ;
};
+String STR_ObjNameSingulQUADRND
+{
+Text [ en-US ] = "rounded square" ;
+};
String STR_ObjNamePluralQUADRND
{
Text [ en-US ] = "Rounded Squares" ;
};
+String STR_ObjNameSingulPARALRND
+{
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/qa
sw/qa/extras/tiledrendering/tiledrendering.cxx | 38 +
1 file changed, 21 insertions(+), 17 deletions(-)
New commits:
commit 39ab67b40af7d4f0af1e4fbac06b398042dbeb1b
Author: Jan Holesovsky
Date: Tue May 30 09:44:19 2017 +0200
lambda -> function in anonymous namespace.
Change-Id: Id2243d445bed35a1561c03d84cfb7162b6b90cdf
Reviewed-on: https://gerrit.libreoffice.org/38181
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index f915955df2b8..a1694ab269dc 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1722,6 +1722,25 @@ void SwTiledRenderingTest::testRedoRepairResult()
comphelper::LibreOfficeKit::setActive(false);
}
+namespace {
+
+void checkUndoRepairStates(SwXTextDocument* pXTextDocument, SwView* pView1,
SwView* pView2)
+{
+SfxItemSet
aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
+SfxItemSet
aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
+// first view, undo enabled
+pView1->GetState(aItemSet1);
+CPPUNIT_ASSERT(SfxItemState::SET == aItemSet1.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item *
>(aItemSet1.GetItem(SID_UNDO)));
+// second view, undo conflict
+pView2->GetState(aItemSet2);
+CPPUNIT_ASSERT(SfxItemState::SET == aItemSet2.GetItemState(SID_UNDO));
+CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item *
>(aItemSet2.GetItem(SID_UNDO)));
+CPPUNIT_ASSERT_EQUAL(static_cast(UNDO_CONFLICT), dynamic_cast<
const SfxUInt32Item * >(aItemSet2.GetItem(SID_UNDO))->GetValue());
+};
+
+}
+
void SwTiledRenderingTest::testDisableUndoRepair()
{
comphelper::LibreOfficeKit::setActive();
@@ -1745,27 +1764,12 @@ void SwTiledRenderingTest::testDisableUndoRepair()
CPPUNIT_ASSERT(SfxItemState::DISABLED ==
aItemSet2.GetItemState(SID_UNDO));
}
-auto fnCheckStates = [pXTextDocument, pView1, pView2]()
-{
-SfxItemSet
aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
-SfxItemSet
aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
-// first view, undo enabled
-pView1->GetState(aItemSet1);
-CPPUNIT_ASSERT(SfxItemState::SET == aItemSet1.GetItemState(SID_UNDO));
-CPPUNIT_ASSERT(!dynamic_cast< const SfxUInt32Item *
>(aItemSet1.GetItem(SID_UNDO)));
-// second view, undo conflict
-pView2->GetState(aItemSet2);
-CPPUNIT_ASSERT(SfxItemState::SET == aItemSet2.GetItemState(SID_UNDO));
-CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item *
>(aItemSet2.GetItem(SID_UNDO)));
-CPPUNIT_ASSERT_EQUAL(static_cast(UNDO_CONFLICT),
dynamic_cast< const SfxUInt32Item * >(aItemSet2.GetItem(SID_UNDO))->GetValue());
-};
-
// Insert a character in the first view.
SfxLokHelper::setView(nView1);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'k', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'k', 0);
Scheduler::ProcessEventsToIdle();
-fnCheckStates();
+checkUndoRepairStates(pXTextDocument, pView1, pView2);
// Insert a character in the second view.
SfxLokHelper::setView(nView2);
@@ -1791,7 +1795,7 @@ void SwTiledRenderingTest::testDisableUndoRepair()
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'l', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'l', 0);
Scheduler::ProcessEventsToIdle();
-fnCheckStates();
+checkUndoRepairStates(pXTextDocument, pView1, pView2);
mxComponent->dispose();
mxComponent.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - editeng/source include/svx svx/source
editeng/source/editeng/eeobj.cxx |7 ---
editeng/source/editeng/eeobj.hxx | 12 ++--
include/svx/svdstr.hrc |9 +
svx/source/svdraw/svdstr.src | 36
4 files changed, 47 insertions(+), 17 deletions(-)
New commits:
commit 5ae5fb482f37176f1746cca4ade5c87b34b135a7
Author: Varun Dhall
Date: Mon May 29 23:15:53 2017 +0530
EditEngine Refactoring hand-coded XInterface implementations of
EditDataObject
EditDataObject has odd hand-coded XInterface implementations,
this is unnecessary and can be improved by replacing its superclasses
Change-Id: Ife19c114450dfd95a10a10de1a78b035babb5443
Reviewed-on: https://gerrit.libreoffice.org/38163
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index fa1392e1138d..0c6bd1246c7c 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -43,13 +43,6 @@ EditDataObject::~EditDataObject()
{
}
-// uno::XInterface
-uno::Any EditDataObject::queryInterface( const uno::Type & rType )
-{
-uno::Any aRet = ::cppu::queryInterface( rType, (static_cast<
datatransfer::XTransferable* >(this)) );
-return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-}
-
// datatransfer::XTransferable
uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor&
rFlavor )
{
diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index 643ef453e34a..30c90c4d299b 100644
--- a/editeng/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
@@ -20,14 +20,12 @@
#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX
#define INCLUDED_EDITENG_SOURCE_EDITENG_EEOBJ_HXX
-#include
+#include
#include
#include
-class EditDataObject : public css::datatransfer::XTransferable,
-public ::cppu::OWeakObject
-
+class EditDataObject : public
::cppu::WeakImplHelper
{
private:
SvMemoryStream maBinData;
@@ -45,12 +43,6 @@ public:
OUString& GetString() { return maText; }
OUString& GetURL(){ return maOfficeBookmark; }
-
-// css::uno::XInterface
-css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() throw()
override { OWeakObject::acquire(); }
-voidSAL_CALL release() throw()
override { OWeakObject::release(); }
-
// css::datatransfer::XTransferable
css::uno::Any SAL_CALL getTransferData( const
css::datatransfer::DataFlavor& aFlavor ) override;
css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL
getTransferDataFlavors( ) override;
commit e29150c307e65b931f6cbfed3e75c9475ab9ecd8
Author: Caolán McNamara
Date: Tue May 30 10:15:20 2017 +0100
missing resources
since
commit 17e872c3fa87bb596ec8b263b7a2e692b927dcef
Date: Fri Mar 17 13:11:27 2017 +0200
remove unused defines from HRC files in svx(1)
because SdrRectObj::TakeObjNameSingul adds some numbers to ids to find
other ones
Change-Id: I9d0bd3686f4a60b7436950f8e80def9cc3586d9c
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index a1168b708638..90163609b02f 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -38,11 +38,20 @@
#define STR_ObjNamePluralLINE(STR_ObjNameBegin + 12)
#define STR_ObjNameSingulRECT(STR_ObjNameBegin + 13)
#define STR_ObjNamePluralRECT(STR_ObjNameBegin + 14)
+#define STR_ObjNameSingulQUAD(STR_ObjNameBegin + 15)
#define STR_ObjNamePluralQUAD(STR_ObjNameBegin + 16)
+#define STR_ObjNameSingulPARAL (STR_ObjNameBegin + 17)
#define STR_ObjNamePluralPARAL (STR_ObjNameBegin + 18)
+#define STR_ObjNameSingulRAUTE (STR_ObjNameBegin + 19)
+#define STR_ObjNamePluralRAUTE (STR_ObjNameBegin + 20)
+#define STR_ObjNameSingulRECTRND (STR_ObjNameBegin + 21)
#define STR_ObjNamePluralRECTRND (STR_ObjNameBegin + 22)
+#define STR_ObjNameSingulQUADRND (STR_ObjNameBegin + 23)
#define STR_ObjNamePluralQUADRND (STR_ObjNameBegin + 24)
+#define STR_ObjNameSingulPARALRND(STR_ObjNameBegin + 25)
#define STR_ObjNamePluralPARALRND(STR_ObjNameBegin + 26)
+#define STR_ObjNameSingulRAUTERND(STR_ObjNameBegin + 27)
+#define STR_ObjNamePluralRAUTERND(STR_ObjNameBegin + 28)
#define STR_ObjNameSingulCIRC(STR_ObjNameBegin + 29)
#define STR_ObjNamePluralCIRC(STR_ObjNameBegin + 30)
#define STR_ObjNameSingulSECT(STR_ObjNameBegin + 31)
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 036e8b0758a8..d704475e0297 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -73,26 +73,62 @@ String STR_ObjNamePluralRECT
{
Text [ en-US ] = "Rectangles" ;
};
+String STR
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/CommonTools.cxx | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 47bbe217607374ccd3a76f1ef6d82e43efd31ba1
Author: Noel Grandin
Date: Tue May 30 09:13:44 2017 +0200
untwist the logic in convertName2SQLName
Change-Id: Ib3cfa3a8a2bdc691e3f6db25672a37c8ede1ffd5
Reviewed-on: https://gerrit.libreoffice.org/38180
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/commontools/CommonTools.cxx
b/connectivity/source/commontools/CommonTools.cxx
index 3a9f237ce824..82e497b2e65b 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -211,21 +211,19 @@ OUString convertName2SQLName(const OUString& rName,const
OUString& _rSpecials)
{
if(isValidSQLName(rName,_rSpecials))
return rName;
-OUString aNewName(rName);
+
const sal_Unicode* pStr = rName.getStr();
+// if not valid
+if (*pStr >= 128 || rtl::isAsciiDigit(*pStr))
+return OUString();
+
+OUStringBuffer aNewName(rName);
sal_Int32 nLength = rName.getLength();
-bool bValid(*pStr < 128 && !rtl::isAsciiDigit(*pStr));
-for (sal_Int32 i=0; bValid && i < nLength; ++pStr,++i )
+for (sal_Int32 i=0; i < nLength; ++pStr,++i )
if(!isCharOk(*pStr,_rSpecials))
-{
-aNewName = aNewName.replace(*pStr,'_');
-pStr = aNewName.getStr() + i;
-}
-
-if ( !bValid )
-aNewName.clear();
+aNewName[i] = '_';
-return aNewName;
+return aNewName.makeStringAndClear();
}
OUString quoteName(const OUString& _rQuote, const OUString& _rName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help system improvements (II)
Hi Olivier, You did a great job, it seems really good to me. If you need a hand, I can take or contribute to the 4) and 5) "to do” tasks. Let's keep each other updated in the next days. Best regards, Fabio B. > Il giorno 29 mag 2017, alle ore 18:03, Olivier Hallot > ha scritto: > > Hi guys > > I have worked in a new implementation of the Help online. The strategy > was to batch "flatten" all XHP into HTML files with an offline > transformation using xsltproc. > > (by "flatten", I mean resolve all embeds in XHP files) > > see http://vm173.documentfoundation.org > > This way all displayed files are now HTML with minimal javascript. No > more on-line XSLT transformation and their associate issues (delays) and > poor debug. > > Advantages: > 1) preserve all XHP files as-is, authoring tools, DTD. > 2) preserve current translation workflow > 3) all files turned to HTML static, with minimum Javascript > 4) much faster load times, browser cache used. > 5) Honors parameters &System and &DbPAR > 6) URL bookmarking in browser (Ctrl-D) > 7) Page navigation back and forth with browser buttons > 8) preserve current HC2 in LibreOffice (see 1). > 9) resolved for &System and &DbPAR (aka module). > 10) maintained Fabio's bookmark search solution. > 11) index-able by search engines (XHP files were unknown to robots). > 12) pages can be directly accessed: e.g. > http://localhost/text/scalc/01/04060106.html?DbPAR=CALC#bm_id3153114 > 13) can hold Google search snippet in TopRight area (To do) > > Disadvantages (Most are further work): > 1) issue with offline use (file://path/to/pages/) > > To do: > 1) batch create html of localized pages, localized bookmarks > 2) Resolve missing images paths (Icons are in core/icon-themes/) > 3) Resolve protocol file:// for offline use (hit CORS guideline > restriction for browsers) > 4) provide better layout for bookmarks in the left pane > 5) work on web CSS to make it beautiful > 6) Clean up the XSLT filter, set a debug param. > 7) more > > Kendy: should I put it as patch to gerrit? > > regards > -- > Olivier Hallot > LibreOffice Documentation Coordinator > Comunidade LibreOffice > Rio de Janeiro - Brasil - Local Time: UTC-03:00 > http://tdf.io/joinus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: VclPtr tweaks post 5.4.2 ...
On 26.05.2017 11:23, Michael Meeks wrote:
> Hi guys,
>
> Seems like people think this is a good idea; so here is what is planned
> - I'd love some help with it when we're post 5.4.2 - (it's a big change
> so avoiding hurting back-porting is important - with ~3k sites all over
> the code).
could we also get rid of this:
operator reference_type * () const
{
return m_rInnerRef.get();
}
i understand that dangerous traps like this are idiomatic C++ and
required to keep the Java programmers out of our code base etc., but
still...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loolwsd.spec.in
loolwsd.spec.in |1 + 1 file changed, 1 insertion(+) New commits: commit cbafebc58ac6f27696917ad7ee264ef6113614b8 Author: Andras Timar Date: Mon May 29 16:25:13 2017 +0200 package loolconfig to rpm Change-Id: I04b8204fde23bd3c674ec622c959ff5ab7714d98 Reviewed-on: https://gerrit.libreoffice.org/38152 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loolwsd.spec.in b/loolwsd.spec.in index 4559930b..1c7b68db 100644 --- a/loolwsd.spec.in +++ b/loolwsd.spec.in @@ -96,6 +96,7 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name \"*.png\" -a -atime +10 -ex /usr/bin/loolmount /usr/bin/loolstress /usr/bin/looltool +/usr/bin/loolconfig /usr/share/loolwsd/discovery.xml /usr/share/loolwsd/favicon.ico /usr/share/loolwsd/robots.txt ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/CommonTools.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 04161ae40d9ba7fddbdaed183ebadceb8c784ad9 Author: Noel Grandin Date: Tue May 30 11:55:44 2017 +0200 fix convertName2SQLName after my commit 47bbe217607374ccd3a76f1ef6d82e43efd31ba1 "untwist the logic in convertName2SQLName" Change-Id: I3d365a24c538d8ecade2b6fe32fa739d8f4bd211 diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index 82e497b2e65b..2afca36d0604 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -219,8 +219,8 @@ OUString convertName2SQLName(const OUString& rName,const OUString& _rSpecials) OUStringBuffer aNewName(rName); sal_Int32 nLength = rName.getLength(); -for (sal_Int32 i=0; i < nLength; ++pStr,++i ) -if(!isCharOk(*pStr,_rSpecials)) +for (sal_Int32 i=0; i < nLength; ++i) +if(!isCharOk(aNewName[i],_rSpecials)) aNewName[i] = '_'; return aNewName.makeStringAndClear(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help system improvements (II)
Hi Olivier, Olivier Hallot píše v Po 29. 05. 2017 v 13:03 -0300: > I have worked in a new implementation of the Help online. The strategy > was to batch "flatten" all XHP into HTML files with an offline > transformation using xsltproc. > > (by "flatten", I mean resolve all embeds in XHP files) > > see http://vm173.documentfoundation.org > > This way all displayed files are now HTML with minimal javascript. No > more on-line XSLT transformation and their associate issues (delays) and > poor debug. > > Advantages: > 1) preserve all XHP files as-is, authoring tools, DTD. > 2) preserve current translation workflow > 3) all files turned to HTML static, with minimum Javascript > 4) much faster load times, browser cache used. > 5) Honors parameters &System and &DbPAR > 6) URL bookmarking in browser (Ctrl-D) > 7) Page navigation back and forth with browser buttons > 8) preserve current HC2 in LibreOffice (see 1). > 9) resolved for &System and &DbPAR (aka module). > 10) maintained Fabio's bookmark search solution. > 11) index-able by search engines (XHP files were unknown to robots). > 12) pages can be directly accessed: e.g. > http://localhost/text/scalc/01/04060106.html?DbPAR=CALC#bm_id3153114 > 13) can hold Google search snippet in TopRight area (To do) This is great - I love it :-) Indeed, please do push the patch. > Disadvantages (Most are further work): > 1) issue with offline use (file://path/to/pages/) What exactly is the issue, please? In principle, it would be I think great to use JS just for the search, and nothing else, because then we are only minimally dependent on the browser's support of JS? > To do: > 1) batch create html of localized pages, localized bookmarks > 2) Resolve missing images paths (Icons are in core/icon-themes/) > 3) Resolve protocol file:// for offline use (hit CORS guideline > restriction for browsers) What exactly is needed here, please? > 4) provide better layout for bookmarks in the left pane > 5) work on web CSS to make it beautiful :-) > 6) Clean up the XSLT filter, set a debug param. > 7) more > > Kendy: should I put it as patch to gerrit? Yes, definitely - great stuff, Olivier! All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/share/apparmor.sh |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b7988de7c0dcb6aad00864dd07d8be61021ac8d2
Author: Jochen Nitschke
Date: Mon May 22 09:04:40 2017 +0200
tdf#105204 fix iteration over profile
regression of
commit 7bec7abd4c3d78e6a37f523f4fb599134ef51ca7
tdf#105204: ShellCheck nitpicks for apparmor.sh
Change-Id: I5086e2a3af2908fe051c0bdc91753533adf7bafd
Reviewed-on: https://gerrit.libreoffice.org/37896
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke
diff --git a/sysui/desktop/share/apparmor.sh b/sysui/desktop/share/apparmor.sh
index cf554257cf72..253fe87cf78d 100755
--- a/sysui/desktop/share/apparmor.sh
+++ b/sysui/desktop/share/apparmor.sh
@@ -37,11 +37,11 @@ INST_ROOT_FORMAT=${INST_ROOT_FORMAT.}
#Need to escape / for sed
INST_ROOT_SED=${INST_ROOT\\/}
-for filename in $PROFILESFROM
+for filename in $PROFILESFROM/*
do
-tourl=$INSTALLTO$INST_ROOT_FORMAT$filename
-sed "s/INSTDIR-/$INST_ROOT_SED/g" "$PROFILESFROM""$filename" > "$tourl"
-[[ -e $filename ]] || break
+[[ -e $filename ]] || { echo "No profile files found in ""$PROFILESFROM";
exit 1; }
+tourl=$INSTALLTO$INST_ROOT_FORMAT${filename##*/}
+sed "s/INSTDIR-/$INST_ROOT_SED/g" "$filename" > "$tourl"
echo "$tourl"
done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Replace EditEngine binary clipboard with ODF filter - Weekly Report 1 - Varun Dhall
Hi all! During the community bonding period I interacted with my mentors and other fellow developers. I also started actual coding of my project to get a head start. So far, I have refactored hand-coded XInterface implementations of EditDataObject. Also I have successfully exported EditEngine's document into a buffer with ODF filter. We can now export EditEngine's document into flat XML files. Right now I'm working to make all the changes achieved so far to be available in the actual clipboard. My progress can be seen at https://gerrit.libreoffice. org/#/q/project:core+branch:master+topic:gsoc2017-editengine-clipboard Regards, Varun Dhall IRC Nick: varundhall ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source
sw/source/uibase/docvw/edtdd.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit c3c208e1fdfd60b95fc09ed48d9ee975bddb214d
Author: Armin Le Grand
Date: Fri May 26 11:49:58 2017 +0200
tdf#106131 no global drag when anchor drag active
If in Writer dragging the anchor is already active
it is not allowed to enter global object drag mode.
This check was missing and may lead to various
inconsistencies
Change-Id: I7d8dd2a62737e6d5d72f69747ceb21bcb73c45ed
Reviewed-on: https://gerrit.libreoffice.org/38059
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
(cherry picked from commit 1b27bed2d5b6915cda408c6f8d27d15bf13cc9be)
Reviewed-on: https://gerrit.libreoffice.org/38188
Tested-by: Armin Le Grand
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index a355cefa2ca5..399719b1285d 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -85,11 +85,17 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const
Point& rPosPixel )
//We are not selecting and aren't at a selection
bStart = true;
else if ( !g_bFrameDrag && rSh.IsSelFrameMode() &&
-rSh.IsInsideSelectedObj( aDocPos ) )
+rSh.IsInsideSelectedObj( aDocPos ) &&
+nullptr == m_pAnchorMarker)
{
//We are not dragging internally and are not at an
//object (frame, draw object)
+// tdf#106131 *and* AnchorDrag is *not* active: When active,
+// entering global drag mode will destroy the AnchorHdl but
+// keep the now invalid ptr in place, next access will crash.
+// It is indeed wrong to enter drag mode when AnchorDrag is
+// already active
bStart = true;
}
else if( !g_bFrameDrag && m_rView.GetDocShell()->IsReadOnly() &&
___
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/uibase/app/apphdl.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 345be1519e96be63624bf58ca5de0fe9abe16edd
Author: Jan Holesovsky
Date: Tue May 30 10:19:16 2017 +0200
tdf#107729: Disable toolbar items that are not available yet.
Otherwise trying to use them crashes LibreOffice.
Change-Id: I268e5b783905ec7aaaf50cbc629fd44e6341bf8d
Reviewed-on: https://gerrit.libreoffice.org/38184
Reviewed-by: Jan Holesovsky
Tested-by: Jenkins
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 79e4fb4d8ceb..23b9b5bdec25 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -224,6 +224,9 @@ void SwModule::StateOther(SfxItemSet &rSet)
// #i51949# hide e-Mail option if e-Mail is not supported
// #i63267# printing might be disabled
if (!xConfigItem ||
+!xConfigItem->GetResultSet().is() ||
+xConfigItem->GetCurrentDBData().sDataSource.isEmpty() ||
+xConfigItem->GetCurrentDBData().sCommand.isEmpty() ||
(nWhich == FN_MAILMERGE_PRINT_DOCUMENTS &&
Application::GetSettings().GetMiscSettings().GetDisablePrinting()) ||
(nWhich == FN_MAILMERGE_EMAIL_DOCUMENTS &&
!xConfigItem->IsMailAvailable()))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sdext/source
sdext/source/presenter/PresenterScrollBar.cxx |1
sdext/source/presenter/PresenterScrollBar.hxx |3
sdext/source/presenter/PresenterTextView.cxx |6 +
sdext/source/presenter/PresenterTextView.hxx |2
sdext/source/presenter/PresenterTimer.cxx | 96 +++---
sdext/source/presenter/PresenterTimer.hxx |2
6 files changed, 101 insertions(+), 9 deletions(-)
New commits:
commit 07df9ec05b1fa0c5a0a0c3d70c87917d37607155
Author: Michael Stahl
Date: Wed May 24 16:14:56 2017 +0200
rhbz#1425304 sdext: join TimerScheduler thread before shutdown
Use a osl::Condition to interrupt the waiting thread, and join it.
Change-Id: I638a2495afd082446c39faf9362578bd0f758d04
(cherry picked from commit 15b033d1dd09cd1898a994a0f12e38ed5cf847cb)
Reviewed-on: https://gerrit.libreoffice.org/38203
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx
b/sdext/source/presenter/PresenterScrollBar.cxx
index 89ac7f52ce16..988b3d82d791 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -790,6 +790,7 @@ void PresenterScrollBar::MousePressRepeater::Start (const
PresenterScrollBar::Ar
// Schedule repeated executions.
auto pThis(shared_from_this());
mnMousePressRepeaterTaskId = PresenterTimer::ScheduleRepeatedTask (
+mpScrollBar->GetComponentContext(),
[pThis] (TimeValue const& rTime) { return pThis->Callback(rTime);
},
5,
25000);
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx
b/sdext/source/presenter/PresenterScrollBar.hxx
index 46a6704bc7f8..70c670e7fb34 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -58,6 +58,9 @@ public:
virtual void SAL_CALL disposing() override;
+css::uno::Reference const&
+GetComponentContext() { return mxComponentContext; }
+
void SetVisible (const bool bIsVisible);
/** Set the bounding box of the scroll bar.
diff --git a/sdext/source/presenter/PresenterTextView.cxx
b/sdext/source/presenter/PresenterTextView.cxx
index 3e4d174a21eb..ca48c6f15f4f 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -73,6 +73,7 @@ PresenterTextView::PresenterTextView (
mpFont(),
maParagraphs(),
mpCaret(new PresenterTextCaret(
+ rxContext,
[this] (sal_Int32 const nParagraphIndex, sal_Int32 const
nCharacterIndex)
{ return this->GetCaretBounds(nParagraphIndex, nCharacterIndex);
},
rInvalidator)),
@@ -1068,9 +1069,11 @@ void PresenterTextParagraph::SetupCellArray (
//= PresenterTextCaret
PresenterTextCaret::PresenterTextCaret (
+uno::Reference const& xContext,
const ::std::function& rCharacterBoundsAccess,
const ::std::function& rInvalidator)
-: mnParagraphIndex(-1),
+: m_xContext(xContext)
+, mnParagraphIndex(-1),
mnCharacterIndex(-1),
mnCaretBlinkTaskId(0),
mbIsCaretVisible(false),
@@ -1091,6 +1094,7 @@ void PresenterTextCaret::ShowCaret()
if (mnCaretBlinkTaskId == 0)
{
mnCaretBlinkTaskId = PresenterTimer::ScheduleRepeatedTask (
+m_xContext,
[this] (TimeValue const&) { return this->InvertCaret(); },
CaretBlinkInterval,
CaretBlinkInterval);
diff --git a/sdext/source/presenter/PresenterTextView.hxx
b/sdext/source/presenter/PresenterTextView.hxx
index cca8b4a89ad1..5c990c64e89e 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -41,6 +41,7 @@ class PresenterTextCaret
{
public:
PresenterTextCaret (
+css::uno::Reference const& xContext,
const ::std::function&
rCharacterBoundsAccess,
const ::std::function&
@@ -69,6 +70,7 @@ public:
const css::awt::Rectangle& GetBounds() const;
private:
+css::uno::Reference const& m_xContext;
sal_Int32 mnParagraphIndex;
sal_Int32 mnCharacterIndex;
sal_Int32 mnCaretBlinkTaskId;
diff --git a/sdext/source/presenter/PresenterTimer.cxx
b/sdext/source/presenter/PresenterTimer.cxx
index 4c18c07a2c79..0fba43273613 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -18,10 +18,15 @@
*/
#include "PresenterTimer.hxx"
+
#include
#include
+#include
+#include
+
#include
#include
+#include
#include
#include
@@ -70,7 +75,8 @@ class TimerScheduler
public ::osl::Thread
{
public:
-static std::shared_ptr Instance();
+static std::shared_ptr Instance(
+uno::Reference const& xContext);
static SharedTimerTask CreateTimerTask (
const PresenterTimer::Task& rTask,
const Ti
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c6a0932402e8b6b94ce5b8113822b35abdde1bdf Author: Andras Timar Date: Tue May 30 13:17:13 2017 +0200 Updated core Project: translations 1d4f1a394f0a4062448ed8b3ba424d0108f01f1c Updated Slovenian translation Change-Id: I822de5e9f1458893e57537c5a5f675b03b09b80c diff --git a/translations b/translations index dc767382e26b..1d4f1a394f0a 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit dc767382e26be5ac2f42cc5c7470b19fe6cbac3e +Subproject commit 1d4f1a394f0a4062448ed8b3ba424d0108f01f1c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4' - source/sl
source/sl/filter/uiconfig/ui.po|4 source/sl/helpcontent2/source/text/sbasic/guide.po | 12 source/sl/helpcontent2/source/text/sbasic/shared.po| 3358 - source/sl/helpcontent2/source/text/sbasic/shared/02.po |4 source/sl/helpcontent2/source/text/scalc/00.po | 10 source/sl/helpcontent2/source/text/scalc/01.po | 20 source/sl/helpcontent2/source/text/scalc/02.po |4 source/sl/helpcontent2/source/text/scalc/guide.po |4 source/sl/helpcontent2/source/text/schart/00.po| 10 source/sl/helpcontent2/source/text/schart/01.po| 10 source/sl/helpcontent2/source/text/sdraw/guide.po |4 source/sl/helpcontent2/source/text/shared/00.po|8 source/sl/helpcontent2/source/text/shared/01.po| 3394 ++ source/sl/helpcontent2/source/text/shared/02.po|4 source/sl/helpcontent2/source/text/shared/04.po|4 source/sl/helpcontent2/source/text/shared/05.po| 10 source/sl/helpcontent2/source/text/shared/explorer/database.po | 18 source/sl/helpcontent2/source/text/shared/guide.po | 16 source/sl/helpcontent2/source/text/shared/optionen.po | 67 source/sl/helpcontent2/source/text/simpress/01.po |4 source/sl/helpcontent2/source/text/smath/01.po |4 source/sl/helpcontent2/source/text/swriter/02.po |4 source/sl/helpcontent2/source/text/swriter/guide.po|8 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 13 source/sl/sc/uiconfig/scalc/ui.po |4 source/sl/sd/source/ui/app.po | 14 source/sl/sd/uiconfig/simpress/ui.po | 14 source/sl/svx/source/tbxctrls.po | 14 source/sl/svx/uiconfig/ui.po |4 source/sl/sw/uiconfig/swriter/ui.po| 41 source/sl/wizards/source/formwizard.po | 54 source/sl/wizards/source/template.po |4 32 files changed, 2615 insertions(+), 4528 deletions(-) New commits: commit 1d4f1a394f0a4062448ed8b3ba424d0108f01f1c Author: Andras Timar Date: Tue May 30 13:17:13 2017 +0200 Updated Slovenian translation Change-Id: I822de5e9f1458893e57537c5a5f675b03b09b80c diff --git a/source/sl/filter/uiconfig/ui.po b/source/sl/filter/uiconfig/ui.po index 251a5d565e2..42a835e9c1a 100644 --- a/source/sl/filter/uiconfig/ui.po +++ b/source/sl/filter/uiconfig/ui.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 5.4\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2017-05-21 23:06+0200\n" +"POT-Creation-Date: 2017-05-29 09:13+0200\n" "PO-Revision-Date: 2017-05-22 18:23+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" diff --git a/source/sl/helpcontent2/source/text/sbasic/guide.po b/source/sl/helpcontent2/source/text/sbasic/guide.po index 129ecff2310..16adf00654e 100644 --- a/source/sl/helpcontent2/source/text/sbasic/guide.po +++ b/source/sl/helpcontent2/source/text/sbasic/guide.po @@ -1,9 +1,9 @@ #. extracted from helpcontent2/source/text/sbasic/guide msgid "" msgstr "" -"Project-Id-Version: LibreOffice 4.5\n" +"Project-Id-Version: LibreOffice 5.4\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2017-05-15 15:10+0200\n" +"POT-Creation-Date: 2017-05-29 09:13+0200\n" "PO-Revision-Date: 2016-03-16 22:58+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" @@ -476,14 +476,6 @@ msgstr "REM izvedi pogovorno okno" #: sample_code.xhp msgctxt "" "sample_code.xhp\n" -"par_id3146115\n" -"help.text" -msgid "End Sub" -msgstr "End Sub" - -#: sample_code.xhp -msgctxt "" -"sample_code.xhp\n" "hd_id3145387\n" "help.text" msgid "Add an Entry to a ListBox" diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po b/source/sl/helpcontent2/source/text/sbasic/shared.po index 043cd31284b..73340050ceb 100644 --- a/source/sl/helpcontent2/source/text/sbasic/shared.po +++ b/source/sl/helpcontent2/source/text/sbasic/shared.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 5.4\n" "Report-Msgid-Bugs-To: https://bugs.
[Libreoffice-commits] core.git: vcl/source vcl/unx
vcl/source/app/svmain.cxx | 11 ---
vcl/unx/gtk/gtkinst.cxx |6 ++
2 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit d412e969e103253bbc74df8ead9fe3d67ddb53a0
Author: Caolán McNamara
Date: Tue May 30 12:22:00 2017 +0100
Revert "make LANGUAGE setting universal, not just gtk specific"
poxy cppunit tests can't use config here
This reverts commit f55eeb7a45998d16eb0fe49088e172ce45ac4f2b.
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 0e0a2a9bbbff..2a89d80f60f3 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -318,17 +318,6 @@ bool InitVCL()
// soffice/sfx implementation creates the global service manager
pSVData->mpApp->Init();
-//Now that uno has been bootstrapped we can ask the config what the UI
language is so that we can
-//force that in as $LANGUAGE. That way we can get gtk to render widgets RTL
-//if we have a RTL UI in an otherwise LTR locale and get gettext using
externals (e.g. python)
-//to match their translations to our preferred UI language
-OUString
aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(".UTF-8"));
-if (!aLocaleString.isEmpty())
-{
-OUString envVar("LANGUAGE");
-osl_setEnvironment(envVar.pData, aLocaleString.pData);
-}
-
pSVData->mpDefInst->AfterAppInit();
// Fetch AppFileName and make it absolute before the workdir changes...
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index a22ea9c93f87..e01a267b6131 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -167,6 +167,12 @@ GtkInstance::GtkInstance( SalYieldMutex* pMutex )
//UI in a LTR locale
void GtkInstance::AfterAppInit()
{
+OUString
aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(".UTF-8"));
+if (!aLocaleString.isEmpty())
+{
+OUString envVar("LANGUAGE");
+osl_setEnvironment(envVar.pData, aLocaleString.pData);
+}
EnsureInit();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: debian/rules loolwsd.spec.in
debian/rules|2 +-
loolwsd.spec.in |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 87b009c59c8c7edb3cd8cfccf1262313c9951198
Author: Andras Timar
Date: Tue May 30 13:34:39 2017 +0200
--enable-silent-rules for package building
Change-Id: I81ad7624b447b6c5f60e1f6e37e2b93896abe792
diff --git a/debian/rules b/debian/rules
index b725d6a6..976dbde7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
-CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc
--with-lokit-path=`pwd`/bundled/include $(CONFIG_OPTIONS)
+CONFFLAGS = --enable-silent-rules --prefix=/usr --localstatedir=/var
--sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include $(CONFIG_OPTIONS)
# Avoid setcap when doing "make", when building for packaging
# the setcap is done at installation time
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 1c7b68db..01bc6be0 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -62,6 +62,7 @@ Obsoletes: loleaflet <= 1.5.8
%build
%configure \
+ --enable-silent-rules \
--with-lokit-path=bundled/include \
--with-lo-path=%{loroot} \
%if 0%{?config_options:1}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/shapeexport.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit db38e3f201517acf22c1773ae9fc4cb2514788b1
Author: Michael Stahl
Date: Tue May 30 13:11:01 2017 +0200
tdf#108231 tdf#108109 xmloff: SvxUnoDrawingModel doesn't implement...
... XStyleFamiliesSupplier, so try to do without. This is called from
sw in case SWTRANSFER_OBJECTTYPE_DRAWMODEL.
(regression from 9835a5823e0f559aabbc0e15ea126c82229c4bc7)
Change-Id: Ic99ad4bf0c8e6e24fc10da173ec480c9d29c0363
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index 13e8ef9decde..0116c610a5c6 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -389,11 +389,16 @@ void XMLShapeExport::collectShapeAutoStyles(const
uno::Reference< drawing::XShap
// Shapes with a Writer TextBox always have a parent style.
// If there would be none, then just assign the first available.
uno::Reference
xStyleFamiliesSupplier(GetExport().GetModel(), uno::UNO_QUERY);
-uno::Reference xStyleFamilies =
xStyleFamiliesSupplier->getStyleFamilies();
-uno::Reference xFrameStyles =
xStyleFamilies->getByName("FrameStyles").get<
uno::Reference >();
-uno::Sequence aFrameStyles =
xFrameStyles->getElementNames();
-if (aFrameStyles.hasElements())
-aParentName = aFrameStyles[0];
+if (xStyleFamiliesSupplier.is()) // tdf#108231
+{
+uno::Reference xStyleFamilies =
xStyleFamiliesSupplier->getStyleFamilies();
+uno::Reference xFrameStyles =
xStyleFamilies->getByName("FrameStyles").get<
uno::Reference >();
+uno::Sequence aFrameStyles =
xFrameStyles->getElementNames();
+if (aFrameStyles.hasElements())
+{
+aParentName = aFrameStyles[0];
+}
+}
}
// filter propset
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
sc/source/ui/Accessibility/AccessibleDocument.cxx | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 1730bcf18a9a0ed27ed700d3b6ac0545d3cef283
Author: Michael Stahl
Date: Tue May 23 15:30:13 2017 +0200
sc: work around MSVC 2017 ICE in AccessibleDocument.cxx
MSVC 2017 dies with INTERNAL COMPILER ERROR on the ConvertLayerId
function, which uses fancy C++14 constexpr SdrLayerId/strong_int stuff;
it happens to compile without complaint if it is expressed as an
if-elseif chain instead of the switch statement.
Change-Id: Ib1324bbabeb7a971ba090b9647dde55c1cd0d587
(cherry picked from commit f11cbcb60d546ce9c7a840a67458c5c88f8a8531)
Reviewed-on: https://gerrit.libreoffice.org/38202
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index e2336902a3bd..b367101ea151 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -120,20 +120,22 @@ struct ScShapeDataLess
}
static void ConvertLayerId(sal_Int16& rLayerID) // changes the number of
the LayerId so it the accessibility order
{
-switch (rLayerID)
+// note: MSVC 2017 ICE's if this is written as "switch" so use "if"
+if (sal_uInt8(SC_LAYER_FRONT) == rLayerID)
{
-case sal_uInt8(SC_LAYER_FRONT):
rLayerID = 1;
-break;
-case sal_uInt8(SC_LAYER_BACK):
+}
+else if (sal_uInt8(SC_LAYER_BACK) == rLayerID)
+{
rLayerID = 0;
-break;
-case sal_uInt8(SC_LAYER_INTERN):
+}
+else if (sal_uInt8(SC_LAYER_INTERN) == rLayerID)
+{
rLayerID = 2;
-break;
-case sal_uInt8(SC_LAYER_CONTROLS):
+}
+else if (sal_uInt8(SC_LAYER_CONTROLS) == rLayerID)
+{
rLayerID = 3;
-break;
}
}
bool LessThanSheet(const ScAccessibleShapeData* pData) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang sal/osl
compilerplugins/clang/redundantcast.cxx | 24
sal/osl/unx/socket.cxx |2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit f6dda4e1603ee1d901bf747c60f232db1f1b56a5
Author: Stephan Bergmann
Date: Tue May 30 13:40:53 2017 +0200
Make loplugin:redundantcast accept bool(FD_ISSET(...)) again
Change-Id: I4e96c55c246cf806f17df31844a00d0e8a5e4f56
diff --git a/compilerplugins/clang/redundantcast.cxx
b/compilerplugins/clang/redundantcast.cxx
index 148cdbead9be..6a554a774ee2 100644
--- a/compilerplugins/clang/redundantcast.cxx
+++ b/compilerplugins/clang/redundantcast.cxx
@@ -483,6 +483,30 @@ bool
RedundantCast::VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr const * exp
if (loplugin::hasPathnamePrefix(aFileName, SRCDIR
"/svx/source/tbxctrls/fillctrl.cxx"))
return true;
+// See the commit message of d0e7d020fa405ab94f19916ec96fbd4611da0031
+// "socket.c -> socket.cxx" for the reason to have
+//
+// bool(FD_ISSET(...))
+//
+// in sal/osl/unx/socket.cxx:
+auto const sub = compat::getSubExprAsWritten(expr);
+//TODO: Better check that sub is exactly an expansion of FD_ISSET:
+if (sub->getLocEnd().isMacroID()) {
+for (auto loc = sub->getLocStart();
+ loc.isMacroID()
+ && (compiler.getSourceManager()
+ .isAtStartOfImmediateMacroExpansion(loc));
+ loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc))
+{
+if (Lexer::getImmediateMacroName(
+loc, compiler.getSourceManager(), compiler.getLangOpts())
+== "FD_ISSET")
+{
+return true;
+}
+}
+}
+
auto const t1 = expr->getTypeAsWritten();
auto const t2 = compat::getSubExprAsWritten(expr)->getType();
if (t1 != t2)
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index bb8bf337766e..6b24b0ab0143 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -2399,7 +2399,7 @@ sal_Bool SAL_CALL osl_isInSocketSet(oslSocketSet Set,
oslSocket pSocket)
return false;
}
-return FD_ISSET(pSocket->m_Socket, &Set->m_Set);
+return bool(FD_ISSET(pSocket->m_Socket, &Set->m_Set));
}
sal_Int32 SAL_CALL osl_demultiplexSocketEvents(oslSocketSet IncomingSet,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/i18nlangtag svtools/source
include/i18nlangtag/lang.h |3 +--
svtools/source/misc/langtab.src |2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 6ed854fa980804e71365c82821131bbe0cc9708c
Author: Noel Grandin
Date: Tue May 30 10:23:21 2017 +0200
drop LANGUAGE_USER_MALAGASY_PLATEAU define
since it's just an alias for LANGUAGE_MALAGASY_PLATEAU,
at least as far back as
commit 6b678c135da07f34da1bf7b19562366361e95085
"added/checked/aligned MS-LangIDs and mappings from new MS-LCID.pdf"
Change-Id: I18645160cb1808c967fd6efd36e1d4269e4734ff
Reviewed-on: https://gerrit.libreoffice.org/38187
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index f57e648bba54..07cb601e9d78 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -294,7 +294,7 @@ constexpr LanguageType primary(LanguageType lt) { return
LanguageType(sal_uInt16
#define LANGUAGE_LU_CHINA LanguageType(0x0490)
#define LANGUAGE_LUXEMBOURGISH_LUXEMBOURG LanguageType(0x046E) /* obsoletes
LANGUAGE_USER_LUXEMBOURGISH 0x0630 */
#define LANGUAGE_MACEDONIAN LanguageType(0x042F)
-#define LANGUAGE_MALAGASY_PLATEAU LanguageType(0x048D) /* obsoletes
LANGUAGE_USER_MALAGASY_PLATEAU 0x064F */
+#define LANGUAGE_MALAGASY_PLATEAU LanguageType(0x048D) /* obsoletes
LANGUAGE_OBSOLETE_USER_MALAGASY_PLATEAU */
#define LANGUAGE_MALAYALAM LanguageType(0x044C) /* in India
*/
#define LANGUAGE_MALAY_BRUNEI_DARUSSALAMLanguageType(0x083E)
#define LANGUAGE_MALAY_MALAYSIA LanguageType(0x043E)
@@ -620,7 +620,6 @@ constexpr LanguageType primary(LanguageType lt) { return
LanguageType(sal_uInt16
#define LANGUAGE_USER_BUSHI LanguageType(0x064D)
#define LANGUAGE_USER_TAHITIAN LanguageType(0x064E)
#define LANGUAGE_OBSOLETE_USER_MALAGASY_PLATEAU LanguageType(0x064F)
-#define LANGUAGE_USER_MALAGASY_PLATEAU LANGUAGE_MALAGASY_PLATEAU
#define LANGUAGE_USER_PAPIAMENTU_ARUBA LanguageType(0x8079) /*
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_PAPIAMENTU)) */
#define LANGUAGE_USER_SARDINIAN_CAMPIDANESE LanguageType(0x0650)
#define LANGUAGE_USER_SARDINIAN_GALLURESE LanguageType(0x0651)
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ec44fb76be1c..ebdffae445a9 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -301,7 +301,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Maore" ; LANGUAGE_USER_MAORE ; > ;
< "Bushi" ; LANGUAGE_USER_BUSHI ; > ;
< "Tahitian" ; LANGUAGE_USER_TAHITIAN ; > ;
-< "Malagasy, Plateau" ; LANGUAGE_USER_MALAGASY_PLATEAU ; > ;
+< "Malagasy, Plateau" ; LANGUAGE_MALAGASY_PLATEAU ; > ;
< "Papiamentu (Netherlands Antilles)" ; LANGUAGE_PAPIAMENTU ; > ;
< "Papiamento (Aruba)" ; LANGUAGE_USER_PAPIAMENTU_ARUBA ; > ;
< "Sardinian, Campidanese" ; LANGUAGE_USER_SARDINIAN_CAMPIDANESE ; > ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libetonyek
external/libetonyek/UnpackedTarball_libetonyek.mk |1
external/libetonyek/silence-libxml.patch | 24 ++
2 files changed, 25 insertions(+)
New commits:
commit a9e3dc3c2acf95248cb0f64634ca5b203802d46e
Author: Caolán McNamara
Date: Tue May 30 13:21:45 2017 +0100
stop spewing libxml2 warnings during filter detection
Change-Id: Ifef3e75065e55aefba0f9498cf517efaf78ba6c1
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index eba2f6a8b574..82c1709a69b5 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
+ external/libetonyek/silence-libxml.patch \
external/libetonyek/0001-fix-brain-fart.patch.1 \
))
diff --git a/external/libetonyek/silence-libxml.patch
b/external/libetonyek/silence-libxml.patch
new file mode 100644
index ..f8730bf332b2
--- /dev/null
+++ b/external/libetonyek/silence-libxml.patch
@@ -0,0 +1,24 @@
+--- src/lib/EtonyekDocument.cpp
src/lib/EtonyekDocument.cpp
+@@ -103,12 +103,21 @@
+ return false;
+ }
+
++namespace
++{
++ void handleError(void * /*arg*/, const char * /*msg*/, xmlParserSeverities
/*severity*/, xmlTextReaderLocatorPtr /*locator*/)
++ {
++ }
++}
++
+ bool probeXML(DetectionInfo &info)
+ {
+ const shared_ptr reader(xmlReaderForIO(readFromStream,
closeStream, info.m_input.get(), "", 0, 0), xmlFreeTextReader);
+ if (!reader)
+ return false;
+
++ xmlTextReaderSetErrorHandler(reader.get(), handleError, NULL);
++
+ int ret = 0;
+ do
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/printaccessoryview.mm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 81318b9a7b1d0f17250b15d6a65c7c04abc59193
Author: Stephan Bergmann
Date: Tue May 30 14:38:02 2017 +0200
loplugin:stringcopy (macOS)
Change-Id: I917982ff7cd6e342125dc4349de7d16e1dad9f22
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 7e155c4e537a..2e73957b4024 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -172,14 +172,14 @@ public:
rtl::OUString getMoreString()
{
return maLocalizedStrings.Count() >= 4
- ? OUString( maLocalizedStrings.GetString( 3 ) )
+ ? maLocalizedStrings.GetString( 3 )
: OUString( "More" );
}
rtl::OUString getPrintSelectionString()
{
return maLocalizedStrings.Count() >= 5
- ? OUString( maLocalizedStrings.GetString( 4 ) )
+ ? maLocalizedStrings.GetString( 4 )
: OUString( "Print selection only" );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/redundantcast.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 3dda91dda8764adb3f6cc229236281bb270bba92
Author: Stephan Bergmann
Date: Tue May 30 14:39:23 2017 +0200
Traverse InitListExpr only once
Arbitrarily chosing to traverse the semantic instead of the syntactic form.
Change-Id: Id1b4e49421a5550bb2fa9f0d7e6f83bf7abb6ebb
diff --git a/compilerplugins/clang/redundantcast.cxx
b/compilerplugins/clang/redundantcast.cxx
index 6a554a774ee2..4ffef355bd6a 100644
--- a/compilerplugins/clang/redundantcast.cxx
+++ b/compilerplugins/clang/redundantcast.cxx
@@ -79,6 +79,15 @@ public:
}
}
+bool TraverseInitListExpr(
+InitListExpr * expr, DataRecursionQueue * queue = nullptr)
+{
+return WalkUpFromInitListExpr(expr)
+&& TraverseSynOrSemInitListExpr(
+expr->isSemanticForm() ? expr : expr->getSemanticForm(),
+queue);
+}
+
bool VisitImplicitCastExpr(ImplicitCastExpr const * expr);
bool VisitCXXStaticCastExpr(CXXStaticCastExpr const * expr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - 2 commits - sw/source
sw/source/core/crsr/crsrsh.cxx |1 +
sw/source/uibase/app/apphdl.cxx |3 +++
2 files changed, 4 insertions(+)
New commits:
commit 85460d3d92c153f76210b82b3e5ac78f005858c6
Author: Jan Holesovsky
Date: Tue May 30 10:19:16 2017 +0200
tdf#107729: Disable toolbar items that are not available yet.
Otherwise trying to use them crashes LibreOffice.
Change-Id: I268e5b783905ec7aaaf50cbc629fd44e6341bf8d
Reviewed-on: https://gerrit.libreoffice.org/38186
Reviewed-by: Jan Holesovsky
Tested-by: Jenkins
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 79e4fb4d8ceb..23b9b5bdec25 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -224,6 +224,9 @@ void SwModule::StateOther(SfxItemSet &rSet)
// #i51949# hide e-Mail option if e-Mail is not supported
// #i63267# printing might be disabled
if (!xConfigItem ||
+!xConfigItem->GetResultSet().is() ||
+xConfigItem->GetCurrentDBData().sDataSource.isEmpty() ||
+xConfigItem->GetCurrentDBData().sCommand.isEmpty() ||
(nWhich == FN_MAILMERGE_PRINT_DOCUMENTS &&
Application::GetSettings().GetMiscSettings().GetDisablePrinting()) ||
(nWhich == FN_MAILMERGE_EMAIL_DOCUMENTS &&
!xConfigItem->IsMailAvailable()))
{
commit c3a09bc2025c8cb3c52d45f6a65152d1aebf0536
Author: Michael Stahl
Date: Mon May 29 22:53:16 2017 +0200
tdf#96256 sw: fix scrolling to cursor after paste
The mnStartAction hack in commit 587006cac508616f486aea45e265a170bcccdc87
has a surprising effect on SwViewShell::SizeChgNotify(), as it causes
PageNumNotify() to be called instead of SizeNotify() if pages are
inserted while layouting in GetCharRect().
Now SwCursorShell::UpdateCursor(SCROLLWIN) would no longer scroll to
the cursor position, which is a problem for clipboard paste.
Try to fix this by calling UISizeNotify() manually, which seems to work.
Change-Id: Id08bfe2964564c02fe9d1ef0176939ab3eeb187a
(cherry picked from commit 6f1530bfdefc8e4deabf37ab337e09a89d3841b3)
Reviewed-on: https://gerrit.libreoffice.org/38204
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index d88d76272a56..bfc6cd1cc8ed 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1770,6 +1770,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool
bIdleEnd )
pFrame->GetCursorOfst( pShellCursor->GetPoint(), rPt, &aTmpState );
}
--mnStartAction;
+UISizeNotify(); // tdf#96256 update view size
if( !pShellCursor->HasMark() )
m_aCursorHeight = aTmpState.m_aRealHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/infobar.hxx |1
include/sfx2/objsh.hxx |2 +
include/sfx2/viewfrm.hxx |1
sfx2/source/dialog/infobar.cxx |5 +++
sfx2/source/doc/objserv.cxx| 60 +
sfx2/source/view/viewfrm.cxx | 50 +-
6 files changed, 83 insertions(+), 36 deletions(-)
New commits:
commit e744e9f4492d3013742fcdb6254cd76528870e9d
Author: Katarina Behrens
Date: Mon May 29 15:53:19 2017 +0200
tdf#105566: Add/remove infobar when the signature status changes
this time without stack overflow. Updating existing infobar needs
some work still
This patch is partially based on work of samuel_m
Change-Id: I2c44c14e27cf85a1014b01e5588b7b53990033b9
Reviewed-on: https://gerrit.libreoffice.org/38148
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index 4ad6d8a7ab14..4e49213c19f6 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -95,6 +95,7 @@ class SfxInfoBarContainerWindow : public vcl::Window
InfoBarType ibType,
WinBits nMessageStyle =
WB_LEFT|WB_VCENTER);
VclPtr getInfoBar(const OUString& sId);
+bool hasInfoBarWithID(const OUString& sId);
void removeInfoBar(VclPtr const & pInfoBar);
virtual void Resize() override;
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index f3c916c28b1e..7ebafede041c 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -37,6 +37,7 @@
#include
#include
+#include
#include
#include
#include
@@ -365,6 +366,7 @@ public:
voidSignDocumentContent();
SignatureState GetScriptingSignatureState();
voidSignScriptingContent();
+DECL_LINK(SignDocumentHandler, Button*, void);
virtual VclPtr CreateDocumentInfoDialog( const
SfxItemSet& );
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 9d803bf8b2d6..e4392d590f34 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -176,6 +176,7 @@ public:
const OUString& sMessage,
InfoBarType aInfoBarType);
void RemoveInfoBar(const OUString& sId);
+bool HasInfoBarWithID(const OUString& sId);
SAL_DLLPRIVATE void GetDocNumber_Impl();
SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh );
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 69b4df48df69..b093718f4e86 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -359,6 +359,11 @@ VclPtr
SfxInfoBarContainerWindow::getInfoBar(const OUString& s
return nullptr;
}
+bool SfxInfoBarContainerWindow::hasInfoBarWithID( const OUString &sId )
+{
+return ( getInfoBar( sId ) != nullptr );
+}
+
void SfxInfoBarContainerWindow::removeInfoBar(VclPtr const &
pInfoBar)
{
// Remove
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 6e1f008627df..edebf6a3cae5 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -64,6 +64,7 @@
#include
#include
#include
+#include
#include
#include
@@ -90,6 +91,7 @@
#include
#include
#include
+#include
#include "app.hrc"
#include
@@ -1033,6 +1035,60 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
}
case SID_SIGNATURE:
{
+SfxViewFrame *pFrame = SfxViewFrame::Current();
+if ( pFrame )
+{
+SignatureState eState = GetDocumentSignatureState();
+InfoBarType aInfoBarType(InfoBarType::Info);
+OUString sMessage("");
+
+switch (eState)
+{
+case SignatureState::BROKEN:
+sMessage = SfxResId(STR_SIGNATURE_BROKEN);
+aInfoBarType = InfoBarType::Danger;
+break;
+case SignatureState::NOTVALIDATED:
+sMessage = SfxResId(STR_SIGNATURE_NOTVALIDATED);
+aInfoBarType = InfoBarType::Warning;
+break;
+case SignatureState::PARTIAL_OK:
+sMessage = SfxResId(STR_SIGNATURE_PARTIAL_OK);
+aInfoBarType = InfoBarType::Warning;
+break;
+case SignatureState::OK:
+sMessage = SfxResId(STR_SIGNATURE_OK);
+aInfoBarType = InfoBarType::Info;
+break;
+default:
+break;
+}
+
+// new info bar
+if (
[Libreoffice-commits] core.git: compilerplugins/clang svx/source
compilerplugins/clang/redundantcast.cxx | 24 +---
svx/source/sidebar/area/AreaPropertyPanel.cxx | 16
svx/source/tbxctrls/fillctrl.cxx | 12 ++--
3 files changed, 27 insertions(+), 25 deletions(-)
New commits:
commit 7d858ad0575b8be58dfb69773e2fba2cf95409c8
Author: Stephan Bergmann
Date: Tue May 30 15:46:55 2017 +0200
Restrict loplugin:redundantcast to "real" casts
Change-Id: Ifc9de898e5c9a084cbfd739625c679185c3a1534
diff --git a/compilerplugins/clang/redundantcast.cxx
b/compilerplugins/clang/redundantcast.cxx
index 4ffef355bd6a..8b5eb3d90e91 100644
--- a/compilerplugins/clang/redundantcast.cxx
+++ b/compilerplugins/clang/redundantcast.cxx
@@ -480,17 +480,20 @@ bool
RedundantCast::VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr const * exp
return true;
if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/svl/qa/"))
return true;
-// the array-of-struct initialiser here makes clang unhappy if I remove
all of the "SchemeInfo" names
-if (loplugin::hasPathnamePrefix(aFileName, SRCDIR
"/tools/source/fsys/urlobj.cxx"))
-return true;
-// 2 structs with compiled-generated constructors where I cannot remove
the cast even though the cast is a NoOp
-if (loplugin::hasPathnamePrefix(aFileName, SRCDIR
"/tools/source/inet/inetmime.cxx"))
-return true;
-// some explicit use of std::initializer_list
-if (loplugin::hasPathnamePrefix(aFileName, SRCDIR
"/svx/source/sidebar/area/AreaPropertyPanel.cxx"))
-return true;
-if (loplugin::hasPathnamePrefix(aFileName, SRCDIR
"/svx/source/tbxctrls/fillctrl.cxx"))
+
+// Restrict this to "real" casts (compared to uses of braced-init-list,
like
+//
+// Foo{bar, baz}
+//
+// or
+//
+// std::initializer_list{bar, baz}
+//
+// ), at least for now:
+auto const sub = compat::getSubExprAsWritten(expr);
+if (isa(sub) || isa(sub)) {
return true;
+}
// See the commit message of d0e7d020fa405ab94f19916ec96fbd4611da0031
// "socket.c -> socket.cxx" for the reason to have
@@ -498,7 +501,6 @@ bool
RedundantCast::VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr const * exp
// bool(FD_ISSET(...))
//
// in sal/osl/unx/socket.cxx:
-auto const sub = compat::getSubExprAsWritten(expr);
//TODO: Better check that sub is exactly an expansion of FD_ISSET:
if (sub->getLocEnd().isMacroID()) {
for (auto loc = sub->getLocStart();
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx
b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 58f3aed8a68f..10f3798e5bdb 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -124,8 +124,8 @@ void AreaPropertyPanel::setFillStyleAndColor(const
XFillStyleItem* pStyleItem,
{
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_COLOR,
SfxCallMode::RECORD, (pStyleItem)
-? std::initializer_list({ &rColorItem,
pStyleItem })
-: std::initializer_list({ &rColorItem }));
+? std::initializer_list{ &rColorItem,
pStyleItem }
+: std::initializer_list{ &rColorItem });
}
void AreaPropertyPanel::setFillStyleAndGradient(const XFillStyleItem*
pStyleItem,
@@ -133,8 +133,8 @@ void AreaPropertyPanel::setFillStyleAndGradient(const
XFillStyleItem* pStyleItem
{
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_GRADIENT,
SfxCallMode::RECORD, (pStyleItem)
-? std::initializer_list({ &rGradientItem,
pStyleItem })
-: std::initializer_list({ &rGradientItem }));
+? std::initializer_list{ &rGradientItem,
pStyleItem }
+: std::initializer_list{ &rGradientItem });
}
void AreaPropertyPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem,
@@ -142,8 +142,8 @@ void AreaPropertyPanel::setFillStyleAndHatch(const
XFillStyleItem* pStyleItem,
{
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_HATCH,
SfxCallMode::RECORD, (pStyleItem)
-? std::initializer_list({ &rHatchItem,
pStyleItem })
-: std::initializer_list({ &rHatchItem }));
+? std::initializer_list{ &rHatchItem,
pStyleItem }
+: std::initializer_list{ &rHatchItem });
}
void AreaPropertyPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem,
@@ -151,8 +151,8 @@ void AreaPropertyPanel::setFillStyleAndBitmap(const
XFillStyleItem* pStyleItem,
{
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_BITMAP,
SfxCallMode::RECORD, (pStyleItem)
-? std::initializer_list({ &rBitmapItem,
pStyleItem })
-: std::initializer_list({ &rBitmapItem }));
+? std::initializer_list{ &rBitmapItem,
pStyleItem }
+: std::initializer_list{ &rBitmapItem });
}
} } // end of namespace svx::sidebar
diff --git a/svx/source/tbxctrls/fillctrl.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff810509839be584ec0c351a620c61bf32d055f2 Author: Olivier Hallot Date: Tue May 30 10:19:56 2017 -0300 Updated core Project: help 72e210bd694688738bffb6855221e2b1ff0b1e72 Rewrite online help contents I have worked in a new implementation of the Help online. The strategy was to batch "flatten" all XHP into HTML files with an offline transformation using xsltproc. (by "flatten", I mean resolve all embeds in XHP files) see http://vm173.documentfoundation.org This way all displayed files are now HTML with minimal javascript. No more on-line XSLT transformation and their associate issues (delays) and poor debug. Advantages: 1) preserve all XHP files as-is, authoring tools, DTD. 2) preserve current translation workflow 3) all files turned to HTML static, with minimum Javascript 4) much faster load times, browser cache used. 5) Honors parameters &System and &DbPAR 6) URL bookmarking in browser (Ctrl-D) 7) Page navigation back and forth with browser buttons 8) preserve current HC2 in LibreOffice (see 1). 9) resolved for &System and &DbPAR (aka module). 10) maintained Fabio's bookmark search solution. 11) index-able by search engines (XHP files were unknown to robots). 12) pages can be directly accessed: e.g. http://localhost/text/scalc/01/04060106.html?DbPAR=CALC#bm_id3153114 13) hold Google search snippet in TopRight area Disadvantages (Most are further work): 1) issue with offline use (file://path/to/pages/) To do: 1) batch create html of localized pages, localized bookmarks 2) Resolve missing images paths (Icons are in core/icon-themes/) 3) Resolve protocol file:// for offline use (hit CORS guideline restriction for browsers) 4) provide better layout for bookmarks in the left pane 5) work on web CSS to make it beautiful 6) Clean up the XSLT filter, set a debug param. 7) more Change-Id: I6de74037dbb59da872153f853237afd75b47c917 Reviewed-on: https://gerrit.libreoffice.org/38220 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6e54fc4fe1c0..72e210bd6946 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6e54fc4fe1c01d4b3b015b9074f0dc8d10257ee9 +Subproject commit 72e210bd694688738bffb6855221e2b1ff0b1e72 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/default.css source/get_bookmark.sh source/get_bookmark.xsl source/HELP-IN-BROWSER-README.txt source/help.js source/help-to-html.sh source/online_transform.xsl
source/HELP-IN-BROWSER-README.txt | 44 source/default.css| 18 ++- source/get_bookmark.sh| 47 + source/get_bookmark.xsl |5 - source/help-to-html.sh| 24 source/help.js| 186 ++ source/online_transform.xsl | 183 + 7 files changed, 244 insertions(+), 263 deletions(-) New commits: commit 72e210bd694688738bffb6855221e2b1ff0b1e72 Author: Olivier Hallot Date: Tue May 30 10:19:56 2017 -0300 Rewrite online help contents I have worked in a new implementation of the Help online. The strategy was to batch "flatten" all XHP into HTML files with an offline transformation using xsltproc. (by "flatten", I mean resolve all embeds in XHP files) see http://vm173.documentfoundation.org This way all displayed files are now HTML with minimal javascript. No more on-line XSLT transformation and their associate issues (delays) and poor debug. Advantages: 1) preserve all XHP files as-is, authoring tools, DTD. 2) preserve current translation workflow 3) all files turned to HTML static, with minimum Javascript 4) much faster load times, browser cache used. 5) Honors parameters &System and &DbPAR 6) URL bookmarking in browser (Ctrl-D) 7) Page navigation back and forth with browser buttons 8) preserve current HC2 in LibreOffice (see 1). 9) resolved for &System and &DbPAR (aka module). 10) maintained Fabio's bookmark search solution. 11) index-able by search engines (XHP files were unknown to robots). 12) pages can be directly accessed: e.g. http://localhost/text/scalc/01/04060106.html?DbPAR=CALC#bm_id3153114 13) hold Google search snippet in TopRight area Disadvantages (Most are further work): 1) issue with offline use (file://path/to/pages/) To do: 1) batch create html of localized pages, localized bookmarks 2) Resolve missing images paths (Icons are in core/icon-themes/) 3) Resolve protocol file:// for offline use (hit CORS guideline restriction for browsers) 4) provide better layout for bookmarks in the left pane 5) work on web CSS to make it beautiful 6) Clean up the XSLT filter, set a debug param. 7) more Change-Id: I6de74037dbb59da872153f853237afd75b47c917 Reviewed-on: https://gerrit.libreoffice.org/38220 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/HELP-IN-BROWSER-README.txt b/source/HELP-IN-BROWSER-README.txt index ab8f49a5d..159c13482 100644 --- a/source/HELP-IN-BROWSER-README.txt +++ b/source/HELP-IN-BROWSER-README.txt @@ -28,24 +28,18 @@ default.css: - the cascading style sheet for HTML formatting. -index.html: -The entry web page in the root folder of the server. Displays the #TopLeft with links to LibreOffice modules help libraries. - online_transform.xsl: the XSL transform file. Transform XHP files into HTML files. This file is a modification of xmlhelper/util/main_transform.xsl, which was designed for xmlhelp XSL processor. -The XSLT online_transform.xsl is used inside help.js. - help.js --- This javascript file: -1. takes XHP files and online_transform.xsl and generates the HTML contents to be displayed in #DisplayArea . +1. modifies href attributes in of #DisplayArea to handle &DbPAR and &System params 2. picks the bookmarks file and displays in #BottomLeft area. -3. displays the XHP file patch and bookmark in the #TopRight area +3. Reads URL params. - New âObjectâ tag @@ -71,39 +65,9 @@ Maps to HTML5 tag: How to build the LibreOffice Browser help - -1) Media files: Media files in helpcontent2 are located in module -icons-themes/ . It is necessary to copy core/icon-themes/galaxy into the media/ folder +1) run help-to-html.sh -Note: For the moment, only Galaxy icon them is fully supported. -2) Run the getbookmark.sh script to generate the bookmark index for the -LibreOffice Modules +2) copy folder html/ to your root web server. -- -Folder layout. -- -Root folder:source/ - default.css - online_transform.xsl - index.html - help.js - jquery-min.js - media/ - movies/ - screenshots/ - text/ - - -Notes: -1. the online_transform.xsl is main_transform.xsl of HC2 modified to accomodate the layout of the screen, It has 4 hooked in each of t
[Libreoffice-commits] help.git: Branch 'libreoffice-5-4' - source/text
source/text/shared/optionen/01010501.xhp | 141 ++- 1 file changed, 85 insertions(+), 56 deletions(-) New commits: commit 1855c986461918b9ccac692e8d80a6d4b8c8ff3e Author: Gabor Kelemen Date: Mon May 8 03:20:53 2017 +0200 tdf#107077 New help page for the 'Pick a Color' window Change-Id: I18ccf5444aee8d6dbdbfc98102524ef8f46ffd44 TODO: correct the howtoget section Reviewed-on: https://gerrit.libreoffice.org/37369 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot (cherry picked from commit bf3f3bd7b3428fc1c9bc0ec47d1b0962f059e747) Reviewed-on: https://gerrit.libreoffice.org/38222 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/shared/optionen/01010501.xhp b/source/text/shared/optionen/01010501.xhp index 107cb1a68..32e2d4921 100644 --- a/source/text/shared/optionen/01010501.xhp +++ b/source/text/shared/optionen/01010501.xhp @@ -22,79 +22,108 @@ -Color +Selecting a new color /text/shared/optionen/01010501.xhp - -Sun Microsystems, Inc. - -Color -defining;colors +Selecting a new color + +defining;colors colors;selection colors;adding -Allows you to define your own colors using the two-dimensional graphic and numerical gradient chart. - Click OK to display the newly defined color in the preview box of the Colors register, where you can then decide if you want to add or replace the new color in the current color palette.UFI: make this a guide file plus ref link + + +%PRODUCTNAME let you to define custom colors using a two-dimensional graphic and numerical gradient chart of the Pick a Color dialog. Click OK to display the newly defined color in the New preview box of the Colors tab, where you can then decide if you want to add or replace the new color in the current color palette. -Color Window -In the two big color windows, you click to select a new color. You can select the color in the left or the right color window as you wish. -In the right color window, you will see the entire color spectrum from the left to the right, with the colors at the top being fully saturated and the colors at the bottom being unsaturated. -In the left color window, you will see a selection of colors, displaying a progressive spectrum, varying between the four colors in the four corners of this window. You can change the colors in the four corners as follows: - +Pick a Color Window +The Pick a Color Dialog window consist of four main areas. + + + +The radio buttons select the color component of the color. This color component can be expressed in either RGB (Red, Green, Blue) or HSB (Hue, Saturation, Brightness) color models. The CMYK color model is not selectable are provided only to ease the input of color values using CMYK notation. + -Click the corner of the field in which you want to change the color. +The spin buttons are for entering the numerical value of the color component. -In the right color window, click the desired new color for the corner field or enter the values, which define the color, in the numeric input fields. + +With the vertical color component slider you can modify the value of each component of the color. With the large colored square you can select the color component approximatively. -Apply the color selected on the right to the small field that is marked in the left color window by clicking the <-- button. +The horizontal bottom color bar shows the current color and the new color, side by side. -The gradient in the left color window is immediately adjusted with respect to hue, saturation, and brightness. + + +Click in the big color area on the left to select a new color. Using this selector area you can modify two components of the color as represented in the RGB or HSB color models. Note that these are the two components not selected with the radio buttons on the right side of the dialog. + + +In the right part of the bottom bar, you will see the original color from the parent tab, Colors. + + +In the left part of the bottom bar, the current result of your work in this dialog is visible. + %PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation. - -<-- -Click the <-- button to replace the selected color in the color palette with the color selected at the right. The button is enabled when you select a color in one of the four corners. - ---> -Sets the small selection cursor in the right window on the color, which corresponds to the selected color in the left window and updates the respective values in the numerical fields. - -Cyan -Sets the Cyan color value in the CMYK color model. - -Magenta -Sets the Magenta color value in the CMYK color model. - -Yellow -Sets the Yellow color value in the CMYK color model. - - -Key -Sets the Black color value or key (black) in the CMYK color model. - -Red -Sets the
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5522e90cd95b73669dad98663020af2bd7651255 Author: Gabor Kelemen Date: Mon May 8 03:20:53 2017 +0200 Updated core Project: help bf3f3bd7b3428fc1c9bc0ec47d1b0962f059e747 tdf#107077 New help page for the 'Pick a Color' window Change-Id: I18ccf5444aee8d6dbdbfc98102524ef8f46ffd44 TODO: correct the howtoget section Reviewed-on: https://gerrit.libreoffice.org/37369 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 72e210bd6946..bf3f3bd7b342 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 72e210bd694688738bffb6855221e2b1ff0b1e72 +Subproject commit bf3f3bd7b3428fc1c9bc0ec47d1b0962f059e747 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/01010501.xhp | 141 ++- 1 file changed, 85 insertions(+), 56 deletions(-) New commits: commit bf3f3bd7b3428fc1c9bc0ec47d1b0962f059e747 Author: Gabor Kelemen Date: Mon May 8 03:20:53 2017 +0200 tdf#107077 New help page for the 'Pick a Color' window Change-Id: I18ccf5444aee8d6dbdbfc98102524ef8f46ffd44 TODO: correct the howtoget section Reviewed-on: https://gerrit.libreoffice.org/37369 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/shared/optionen/01010501.xhp b/source/text/shared/optionen/01010501.xhp index 107cb1a68..32e2d4921 100644 --- a/source/text/shared/optionen/01010501.xhp +++ b/source/text/shared/optionen/01010501.xhp @@ -22,79 +22,108 @@ -Color +Selecting a new color /text/shared/optionen/01010501.xhp - -Sun Microsystems, Inc. - -Color -defining;colors +Selecting a new color + +defining;colors colors;selection colors;adding -Allows you to define your own colors using the two-dimensional graphic and numerical gradient chart. - Click OK to display the newly defined color in the preview box of the Colors register, where you can then decide if you want to add or replace the new color in the current color palette.UFI: make this a guide file plus ref link + + +%PRODUCTNAME let you to define custom colors using a two-dimensional graphic and numerical gradient chart of the Pick a Color dialog. Click OK to display the newly defined color in the New preview box of the Colors tab, where you can then decide if you want to add or replace the new color in the current color palette. -Color Window -In the two big color windows, you click to select a new color. You can select the color in the left or the right color window as you wish. -In the right color window, you will see the entire color spectrum from the left to the right, with the colors at the top being fully saturated and the colors at the bottom being unsaturated. -In the left color window, you will see a selection of colors, displaying a progressive spectrum, varying between the four colors in the four corners of this window. You can change the colors in the four corners as follows: - +Pick a Color Window +The Pick a Color Dialog window consist of four main areas. + + + +The radio buttons select the color component of the color. This color component can be expressed in either RGB (Red, Green, Blue) or HSB (Hue, Saturation, Brightness) color models. The CMYK color model is not selectable are provided only to ease the input of color values using CMYK notation. + -Click the corner of the field in which you want to change the color. +The spin buttons are for entering the numerical value of the color component. -In the right color window, click the desired new color for the corner field or enter the values, which define the color, in the numeric input fields. + +With the vertical color component slider you can modify the value of each component of the color. With the large colored square you can select the color component approximatively. -Apply the color selected on the right to the small field that is marked in the left color window by clicking the <-- button. +The horizontal bottom color bar shows the current color and the new color, side by side. -The gradient in the left color window is immediately adjusted with respect to hue, saturation, and brightness. + + +Click in the big color area on the left to select a new color. Using this selector area you can modify two components of the color as represented in the RGB or HSB color models. Note that these are the two components not selected with the radio buttons on the right side of the dialog. + + +In the right part of the bottom bar, you will see the original color from the parent tab, Colors. + + +In the left part of the bottom bar, the current result of your work in this dialog is visible. + %PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation. - -<-- -Click the <-- button to replace the selected color in the color palette with the color selected at the right. The button is enabled when you select a color in one of the four corners. - ---> -Sets the small selection cursor in the right window on the color, which corresponds to the selected color in the left window and updates the respective values in the numerical fields. - -Cyan -Sets the Cyan color value in the CMYK color model. - -Magenta -Sets the Magenta color value in the CMYK color model. - -Yellow -Sets the Yellow color value in the CMYK color model. - - -Key -Sets the Black color value or key (black) in the CMYK color model. - -Red -Sets the Red color value in the RGB color model. - -Green -Sets the Green color value in the RGB color model. - -Blue -Sets the Blue color value in the RGB color model. - -Color -Sets the Hue in
Re: Help system improvements (II)
Hi Kendy, *, On Tue, May 30, 2017 at 12:28 PM, Jan Holesovsky wrote: > Olivier Hallot píše v Po 29. 05. 2017 v 13:03 -0300: > […] >> Disadvantages (Most are further work): >> 1) issue with offline use (file://path/to/pages/) > > What exactly is the issue, please? browsers blocking loading of local files for security reason. >> To do: >> 3) Resolve protocol file:// for offline use (hit CORS guideline >> restriction for browsers) > > What exactly is needed here, please? for chromium, one could make the help an extension package, that way it would be allowed to load files from a configured directory (in other words: add a corresponding manifest file) see also https://bugs.chromium.org/p/chromium/issues/detail?id=40787 ciao Christian -- Christian Lohmaier, Release Engineer Tel: +49 30 5557992-60 | IRC: cloph on Freenode The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 47b8e2a05cae8c32017725f6c498d3d4892ca5c4 Author: Gabor Kelemen Date: Mon May 8 03:20:53 2017 +0200 Updated core Project: help 1855c986461918b9ccac692e8d80a6d4b8c8ff3e tdf#107077 New help page for the 'Pick a Color' window Change-Id: I18ccf5444aee8d6dbdbfc98102524ef8f46ffd44 TODO: correct the howtoget section Reviewed-on: https://gerrit.libreoffice.org/37369 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot (cherry picked from commit bf3f3bd7b3428fc1c9bc0ec47d1b0962f059e747) Reviewed-on: https://gerrit.libreoffice.org/38222 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 35eb7f229b9d..1855c9864619 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 35eb7f229b9d244d5c215984f025a2b10a24d31b +Subproject commit 1855c986461918b9ccac692e8d80a6d4b8c8ff3e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ODF problem with margin between paragraphs of same style
Hi Miklos, Miklos Vajna schrieb: Hi Regina, On Sun, May 28, 2017 at 11:01:14PM +0200, Regina Henschel wrote: What to do? (1) Make a hard cut and render it correctly if a document is saved in ODF 1.3? (2) Add an attribute to ODF 1.3 to allow such rendering? The usual approach we take is enabling incomaptible-but-sane behavior for new documents only. See e.g. c5cf8824a619401627f18abc7b3049551c71ac2a from Michael Stahl for an example of adding a layout compat flag to keep old documents as-is, but have some sanity for new documents. (In the context of Writer.) So I will take it as a simple bug, with no need for any action in the ODF TC. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - xmloff/source
xmloff/source/draw/shapeexport.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit d9ae5391e72b91f80d6915d2ff420e191fdc892f
Author: Michael Stahl
Date: Tue May 30 13:11:01 2017 +0200
tdf#108231 tdf#108109 xmloff: SvxUnoDrawingModel doesn't implement...
... XStyleFamiliesSupplier, so try to do without. This is called from
sw in case SWTRANSFER_OBJECTTYPE_DRAWMODEL.
(regression from 9835a5823e0f559aabbc0e15ea126c82229c4bc7)
Change-Id: Ic99ad4bf0c8e6e24fc10da173ec480c9d29c0363
(cherry picked from commit db38e3f201517acf22c1773ae9fc4cb2514788b1)
Reviewed-on: https://gerrit.libreoffice.org/38213
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index 13e8ef9decde..0116c610a5c6 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -389,11 +389,16 @@ void XMLShapeExport::collectShapeAutoStyles(const
uno::Reference< drawing::XShap
// Shapes with a Writer TextBox always have a parent style.
// If there would be none, then just assign the first available.
uno::Reference
xStyleFamiliesSupplier(GetExport().GetModel(), uno::UNO_QUERY);
-uno::Reference xStyleFamilies =
xStyleFamiliesSupplier->getStyleFamilies();
-uno::Reference xFrameStyles =
xStyleFamilies->getByName("FrameStyles").get<
uno::Reference >();
-uno::Sequence aFrameStyles =
xFrameStyles->getElementNames();
-if (aFrameStyles.hasElements())
-aParentName = aFrameStyles[0];
+if (xStyleFamiliesSupplier.is()) // tdf#108231
+{
+uno::Reference xStyleFamilies =
xStyleFamiliesSupplier->getStyleFamilies();
+uno::Reference xFrameStyles =
xStyleFamilies->getByName("FrameStyles").get<
uno::Reference >();
+uno::Sequence aFrameStyles =
xFrameStyles->getElementNames();
+if (aFrameStyles.hasElements())
+{
+aParentName = aFrameStyles[0];
+}
+}
}
// filter propset
___
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/tiledrendering/tiledrendering.cxx | 42 +
1 file changed, 23 insertions(+), 19 deletions(-)
New commits:
commit cb5746a45ef6b0f209395fea9ce3e7801a574697
Author: Jan Holesovsky
Date: Tue May 30 09:44:19 2017 +0200
lambda -> function in anonymous namespace.
Change-Id: Id2243d445bed35a1561c03d84cfb7162b6b90cdf
Reviewed-on: https://gerrit.libreoffice.org/38189
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 38e131f0b8b8..ecd84826233f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1726,6 +1726,27 @@ void SwTiledRenderingTest::testRedoRepairResult()
comphelper::LibreOfficeKit::setActive(false);
}
+namespace {
+
+void checkUndoRepairStates(SwXTextDocument* pXTextDocument, SwView* pView1,
SwView* pView2)
+{
+SfxItemSet
aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
+SfxItemSet
aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
+// first view, undo enabled
+pView1->GetState(aItemSet1);
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet1.GetItemState(SID_UNDO));
+const SfxUInt32Item *pUnsetItem = dynamic_cast(aItemSet1.GetItem(SID_UNDO));
+CPPUNIT_ASSERT(!pUnsetItem);
+// second view, undo conflict
+pView2->GetState(aItemSet2);
+CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet2.GetItemState(SID_UNDO));
+const SfxUInt32Item *pSetItem = dynamic_cast(aItemSet2.GetItem(SID_UNDO));
+CPPUNIT_ASSERT(pSetItem);
+CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT),
pSetItem->GetValue());
+};
+
+}
+
void SwTiledRenderingTest::testDisableUndoRepair()
{
comphelper::LibreOfficeKit::setActive();
@@ -1751,29 +1772,12 @@ void SwTiledRenderingTest::testDisableUndoRepair()
CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED,
aItemSet2.GetItemState(SID_UNDO));
}
-auto fnCheckStates = [pXTextDocument, pView1, pView2]()
-{
-SfxItemSet
aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
-SfxItemSet
aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), SID_UNDO,
SID_UNDO);
-// first view, undo enabled
-pView1->GetState(aItemSet1);
-CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet1.GetItemState(SID_UNDO));
-const SfxUInt32Item *pUnsetItem = dynamic_cast(aItemSet1.GetItem(SID_UNDO));
-CPPUNIT_ASSERT(!pUnsetItem);
-// second view, undo conflict
-pView2->GetState(aItemSet2);
-CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet2.GetItemState(SID_UNDO));
-const SfxUInt32Item *pSetItem = dynamic_cast(aItemSet2.GetItem(SID_UNDO));
-CPPUNIT_ASSERT(pSetItem);
-CPPUNIT_ASSERT_EQUAL(static_cast(SwUndoId::CONFLICT),
pSetItem->GetValue());
-};
-
// Insert a character in the first view.
SfxLokHelper::setView(nView1);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'k', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'k', 0);
Scheduler::ProcessEventsToIdle();
-fnCheckStates();
+checkUndoRepairStates(pXTextDocument, pView1, pView2);
// Insert a character in the second view.
SfxLokHelper::setView(nView2);
@@ -1801,7 +1805,7 @@ void SwTiledRenderingTest::testDisableUndoRepair()
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'l', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'l', 0);
Scheduler::ProcessEventsToIdle();
-fnCheckStates();
+checkUndoRepairStates(pXTextDocument, pView1, pView2);
mxComponent->dispose();
mxComponent.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help system improvements (II)
Hi Cloph, Christian Lohmaier píše v Út 30. 05. 2017 v 16:15 +0200: > >> 1) issue with offline use (file://path/to/pages/) > > > > What exactly is the issue, please? > > browsers blocking loading of local files for security reason. > > >> To do: > >> 3) Resolve protocol file:// for offline use (hit CORS guideline > >> restriction for browsers) > > > > What exactly is needed here, please? > > for chromium, one could make the help an extension package, that way > it would be allowed to load files from a configured directory (in > other words: add a corresponding manifest file) > > see also > https://bugs.chromium.org/p/chromium/issues/detail?id=40787 That was the problem with loading data via XMLHTTPRequest / jquery's load (we were trying to solve previously); but if the files are static html now, I see no problem to link directly (...), which does not have this problem :-) Or am I missing something? Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/create-ids |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14f892b29f9bf3380d0a07fc61235ee51ab2f93d Author: Stephan Bergmann Date: Tue May 30 17:05:22 2017 +0200 Fix 'make id' ...after 027d661ef7e2490f1182d3e5003ae4da4135e0ca "tdf#105204 fix shellcheck warnings in solenv/bin/create-ids" broke it Change-Id: I03e8b5bbda228bfdcb36599b8c13b530395e9e62 diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 59c532719e38..de1e79155c87 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -15,4 +15,4 @@ if [ "$1" = "--with-outpath" ]; then else dirs="$(ls -d ./*/* | sed -e '/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d')" fi -mkid --lang-map="$(dirname "$0")"/id-lang.map --include='C C++ asm perl java make' --statistics "$dirs" +mkid --lang-map="$(dirname "$0")"/id-lang.map --include='C C++ asm perl java make' --statistics $dirs ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ure/source
ure/source/uno |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0a88690292e7e24b1e3250429364664ef4aa0345
Author: Stephan Bergmann
Date: Tue May 30 17:38:27 2017 +0200
Fix quoting
...broken with 6c80b3730ebe5a95aa685e5f02c285edeb21d4a5 "tdf#105204 fix
shellcheck warnings in ure/source/uno"
Change-Id: I44a6239d47353aea84ff4ab6d597104bd96e0950
diff --git a/ure/source/uno b/ure/source/uno
index 342c6e58a42e..f5222ba1c025 100755
--- a/ure/source/uno
+++ b/ure/source/uno
@@ -28,7 +28,7 @@ done
# Extend the LD_LIBRARY_PATH for Java:
epath=$(dirname "$0")
if [ -x "${epath}/javaldx" ] ; then
-jpath=$("${epath}/javaldx" "$my_envargs")
+jpath=$("${epath}/javaldx" $my_envargs)
if [ -n "${jpath}" ]; then
sd_platform=$(uname -s)
case $sd_platform in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/gengal/gengal.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 182622c757cceda83522f10922596ed4fa452b46
Author: Stephan Bergmann
Date: Tue May 30 17:41:59 2017 +0200
Fix quoting
...broken with 020e1bff16a7bb5f401a2547d211807acd7db0fb "tdf#105204:
ShellCheck
nitpicks for gengal.sh"
Change-Id: I5e7cd0b29be7840f0af44a028eb1c56ac7ffb33b
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
index 8bab14678ff3..b4d10458650a 100755
--- a/svx/source/gengal/gengal.sh
+++ b/svx/source/gengal/gengal.sh
@@ -62,7 +62,7 @@ done
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/javaldx" ] ; then
-my_path=$("$sd_prog/javaldx" "$BOOTSTRAPVARS" \
+my_path=$("$sd_prog/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc")
if [ -n "$my_path" ] ; then
sd_platform=$(uname -s)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - icon-themes/elementary icon-themes/galaxy vcl/source
icon-themes/elementary/vcl/res/check.png |binary icon-themes/elementary/vcl/res/checkmono.png |binary icon-themes/elementary/vcl/res/radio.png |binary icon-themes/elementary/vcl/res/radiomono.png |binary icon-themes/galaxy/vcl/res/check.png |binary icon-themes/galaxy/vcl/res/checkmono.png |binary icon-themes/galaxy/vcl/res/radio.png |binary icon-themes/galaxy/vcl/res/radiomono.png |binary vcl/source/control/button.cxx|4 +--- 9 files changed, 1 insertion(+), 3 deletions(-) New commits: commit ec49295718144aeeb81683bcfe5923c3610e8d21 Author: Caolán McNamara Date: Wed Jan 4 18:39:34 2017 + Resolves: tdf#108111 backport mono checkboxes fix replace the blue which will be set to transparent, with transparent and then we don't "manually" replace a color with transparent which makes tdf#108111 look right again (cherry picked from commit f1a8e00764b32c3b799ecd40dcb4dd632493bc45) Change-Id: I95923685d412145e88b672a50311c767d1425493 Reviewed-on: https://gerrit.libreoffice.org/38223 Reviewed-by: Justin Luth Tested-by: Justin Luth Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/icon-themes/elementary/vcl/res/check.png b/icon-themes/elementary/vcl/res/check.png index daeddd2ddcca..05f8b1c381c3 100644 Binary files a/icon-themes/elementary/vcl/res/check.png and b/icon-themes/elementary/vcl/res/check.png differ diff --git a/icon-themes/elementary/vcl/res/checkmono.png b/icon-themes/elementary/vcl/res/checkmono.png index 69c89139bf49..dce0442c 100644 Binary files a/icon-themes/elementary/vcl/res/checkmono.png and b/icon-themes/elementary/vcl/res/checkmono.png differ diff --git a/icon-themes/elementary/vcl/res/radio.png b/icon-themes/elementary/vcl/res/radio.png index 73e2a04c474c..dff083949b97 100644 Binary files a/icon-themes/elementary/vcl/res/radio.png and b/icon-themes/elementary/vcl/res/radio.png differ diff --git a/icon-themes/elementary/vcl/res/radiomono.png b/icon-themes/elementary/vcl/res/radiomono.png index d9e447102afd..cdee168c1351 100644 Binary files a/icon-themes/elementary/vcl/res/radiomono.png and b/icon-themes/elementary/vcl/res/radiomono.png differ diff --git a/icon-themes/galaxy/vcl/res/check.png b/icon-themes/galaxy/vcl/res/check.png index 3bf35b2d6ae5..05f8b1c381c3 100644 Binary files a/icon-themes/galaxy/vcl/res/check.png and b/icon-themes/galaxy/vcl/res/check.png differ diff --git a/icon-themes/galaxy/vcl/res/checkmono.png b/icon-themes/galaxy/vcl/res/checkmono.png index 4cabe1284025..afdf871f4fe9 100644 Binary files a/icon-themes/galaxy/vcl/res/checkmono.png and b/icon-themes/galaxy/vcl/res/checkmono.png differ diff --git a/icon-themes/galaxy/vcl/res/radio.png b/icon-themes/galaxy/vcl/res/radio.png index c198a6d9ef90..dff083949b97 100644 Binary files a/icon-themes/galaxy/vcl/res/radio.png and b/icon-themes/galaxy/vcl/res/radio.png differ diff --git a/icon-themes/galaxy/vcl/res/radiomono.png b/icon-themes/galaxy/vcl/res/radiomono.png index aba237e266d2..88f101430b82 100644 Binary files a/icon-themes/galaxy/vcl/res/radiomono.png and b/icon-themes/galaxy/vcl/res/radiomono.png differ diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 47dc44a22564..02cd28ca270a 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2766,10 +2766,8 @@ static void LoadThemedImageList (const StyleSettings &rStyleSettings, aColorAry2[4] = rStyleSettings.GetDarkShadowColor(); aColorAry2[5] = rStyleSettings.GetWindowTextColor(); -Color aMaskColor(0x00, 0x00, 0xFF ); static_assert( sizeof(aColorAry1) == sizeof(aColorAry2), "aColorAry1 must match aColorAry2" ); -// FIXME: do we want the mask for the checkbox ? -pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor, +pList->InsertFromHorizontalBitmap (rResId, nImages, nullptr, aColorAry1, aColorAry2, SAL_N_ELEMENTS(aColorAry1)); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - xmloff/source
xmloff/source/draw/shapeexport.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 024fa6b3915fd84586b348b5033dcc4312cd8926
Author: Michael Stahl
Date: Tue May 30 13:11:01 2017 +0200
tdf#108231 tdf#108109 xmloff: SvxUnoDrawingModel doesn't implement...
... XStyleFamiliesSupplier, so try to do without. This is called from
sw in case SWTRANSFER_OBJECTTYPE_DRAWMODEL.
(regression from 9835a5823e0f559aabbc0e15ea126c82229c4bc7)
Change-Id: Ic99ad4bf0c8e6e24fc10da173ec480c9d29c0363
(cherry picked from commit db38e3f201517acf22c1773ae9fc4cb2514788b1)
Reviewed-on: https://gerrit.libreoffice.org/38214
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index f3880cb1c5ab..95013a03a27d 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -385,11 +385,16 @@ void XMLShapeExport::collectShapeAutoStyles(const
uno::Reference< drawing::XShap
// Shapes with a Writer TextBox always have a parent style.
// If there would be none, then just assign the first available.
uno::Reference
xStyleFamiliesSupplier(GetExport().GetModel(), uno::UNO_QUERY);
-uno::Reference xStyleFamilies =
xStyleFamiliesSupplier->getStyleFamilies();
-uno::Reference xFrameStyles =
xStyleFamilies->getByName("FrameStyles").get<
uno::Reference >();
-uno::Sequence aFrameStyles =
xFrameStyles->getElementNames();
-if (aFrameStyles.hasElements())
-aParentName = aFrameStyles[0];
+if (xStyleFamiliesSupplier.is()) // tdf#108231
+{
+uno::Reference xStyleFamilies =
xStyleFamiliesSupplier->getStyleFamilies();
+uno::Reference xFrameStyles =
xStyleFamilies->getByName("FrameStyles").get<
uno::Reference >();
+uno::Sequence aFrameStyles =
xFrameStyles->getElementNames();
+if (aFrameStyles.hasElements())
+{
+aParentName = aFrameStyles[0];
+}
+}
}
// filter propset
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - icon-themes/sifr
icon-themes/sifr/cmd/lc_showtrackchanges.png |binary icon-themes/sifr/cmd/sc_showtrackchanges.png |binary 2 files changed New commits: commit cd38159308f2fc5e53f4d3dffb9200ca78cef8fc Author: Matthias Freund Date: Tue May 30 00:03:34 2017 +0200 tdf#75256 Sifr icon theme - showtrackchanges Change-Id: I0205b71fe1a7123f7bd7e09b597e3e17af4eea57 Reviewed-on: https://gerrit.libreoffice.org/38172 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/icon-themes/sifr/cmd/lc_showtrackchanges.png b/icon-themes/sifr/cmd/lc_showtrackchanges.png new file mode 100644 index ..11a17949d765 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_showtrackchanges.png differ diff --git a/icon-themes/sifr/cmd/sc_showtrackchanges.png b/icon-themes/sifr/cmd/sc_showtrackchanges.png new file mode 100644 index ..fcba9c9429e7 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_showtrackchanges.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - icon-themes/sifr
icon-themes/sifr/cmd/lc_showtrackchanges.png |binary icon-themes/sifr/cmd/sc_showtrackchanges.png |binary 2 files changed New commits: commit 0a481b5e2ac4ccb6d310c4be32941a4fa7355f5a Author: Matthias Freund Date: Tue May 30 00:03:34 2017 +0200 tdf#75256 Sifr icon theme - showtrackchanges Change-Id: I0205b71fe1a7123f7bd7e09b597e3e17af4eea57 Reviewed-on: https://gerrit.libreoffice.org/38171 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/icon-themes/sifr/cmd/lc_showtrackchanges.png b/icon-themes/sifr/cmd/lc_showtrackchanges.png new file mode 100644 index ..11a17949d765 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_showtrackchanges.png differ diff --git a/icon-themes/sifr/cmd/sc_showtrackchanges.png b/icon-themes/sifr/cmd/sc_showtrackchanges.png new file mode 100644 index ..fcba9c9429e7 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_showtrackchanges.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/lc_showtrackchanges.png |binary icon-themes/sifr/cmd/sc_showtrackchanges.png |binary 2 files changed New commits: commit b0067837759006832d2ddb32d05c8d325f52c277 Author: Matthias Freund Date: Tue May 30 00:03:34 2017 +0200 tdf#75256 Sifr icon theme - showtrackchanges Change-Id: I0205b71fe1a7123f7bd7e09b597e3e17af4eea57 Reviewed-on: https://gerrit.libreoffice.org/38170 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/icon-themes/sifr/cmd/lc_showtrackchanges.png b/icon-themes/sifr/cmd/lc_showtrackchanges.png new file mode 100644 index ..11a17949d765 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_showtrackchanges.png differ diff --git a/icon-themes/sifr/cmd/sc_showtrackchanges.png b/icon-themes/sifr/cmd/sc_showtrackchanges.png new file mode 100644 index ..fcba9c9429e7 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_showtrackchanges.png differ ___ 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/bitmap.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 6a01c2d4cab8c3f1a4ba61e7c4e049771612127e
Author: Marco Cecchetti
Date: Mon May 29 21:07:10 2017 +0200
tdf#107682 - Repeated images replace correct ones in exported PDF
The problem was due to the buffer acquire methods: in Bitmap::Checksum
(old implementation) Bitmap::AcquireReadAccess is used to get the bitmap
buffer: indeed this method relies on SalBitmap::AcquireBuffer (which is
used in the new implementation) but in case the buffer acquisition
fails, instead of giving up, it tries to update the imp bitmap instance
embedded in the bitmap (see BitmapInfoAccess::ImplCreate).
The solution is to perform this further attemp in Bitmap::Checksum when
the value returned by ImpBitmap::GetChecksum is 0.
Change-Id: Ib901ac941db57756e9a951bacbc573ca206316e0
Reviewed-on: https://gerrit.libreoffice.org/38165
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 8dc4bd07e0d3..71d5d73f15ab 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -275,6 +275,21 @@ BitmapChecksum Bitmap::GetChecksum() const
if( mxImpBmp )
{
nRet = mxImpBmp->ImplGetChecksum();
+
+if (!nRet)
+{
+// nRet == 0 => probably, we were not able to acquire
+// the buffer in SalBitmap::updateChecksum;
+// so, we need to update the imp bitmap for this bitmap instance
+// as we do in BitmapInfoAccess::ImplCreate
+std::shared_ptr xNewImpBmp(new ImpBitmap);
+if (xNewImpBmp->ImplCreate(*mxImpBmp, GetBitCount()))
+{
+Bitmap* pThis = const_cast(this);
+pThis->mxImpBmp = xNewImpBmp;
+nRet = mxImpBmp->ImplGetChecksum();
+}
+}
}
return nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source
vcl/source/gdi/bitmap.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 83bd801268203a28a47bafd17307c13fbc41e983
Author: Marco Cecchetti
Date: Mon May 29 21:07:10 2017 +0200
tdf#107682 - Repeated images replace correct ones in exported PDF
The problem was due to the buffer acquire methods: in Bitmap::Checksum
(old implementation) Bitmap::AcquireReadAccess is used to get the bitmap
buffer: indeed this method relies on SalBitmap::AcquireBuffer (which is
used in the new implementation) but in case the buffer acquisition
fails, instead of giving up, it tries to update the imp bitmap instance
embedded in the bitmap (see BitmapInfoAccess::ImplCreate).
The solution is to perform this further attemp in Bitmap::Checksum when
the value returned by ImpBitmap::GetChecksum is 0.
Change-Id: Ib901ac941db57756e9a951bacbc573ca206316e0
Reviewed-on: https://gerrit.libreoffice.org/38168
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index cf0bf70343e3..b5641b82857d 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -285,6 +285,21 @@ BitmapChecksum Bitmap::GetChecksum() const
if( mxImpBmp )
{
nRet = mxImpBmp->ImplGetChecksum();
+
+if (!nRet)
+{
+// nRet == 0 => probably, we were not able to acquire
+// the buffer in SalBitmap::updateChecksum;
+// so, we need to update the imp bitmap for this bitmap instance
+// as we do in BitmapInfoAccess::ImplCreate
+std::shared_ptr xNewImpBmp(new ImpBitmap);
+if (xNewImpBmp->ImplCreate(*mxImpBmp, GetBitCount()))
+{
+Bitmap* pThis = const_cast(this);
+pThis->mxImpBmp = xNewImpBmp;
+nRet = mxImpBmp->ImplGetChecksum();
+}
+}
}
return nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/source
vcl/source/gdi/bitmap.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 23ee2d252e4e026657e9b52e5c9132ca201ac43e
Author: Marco Cecchetti
Date: Mon May 29 21:07:10 2017 +0200
tdf#107682 - Repeated images replace correct ones in exported PDF
The problem was due to the buffer acquire methods: in Bitmap::Checksum
(old implementation) Bitmap::AcquireReadAccess is used to get the bitmap
buffer: indeed this method relies on SalBitmap::AcquireBuffer (which is
used in the new implementation) but in case the buffer acquisition
fails, instead of giving up, it tries to update the imp bitmap instance
embedded in the bitmap (see BitmapInfoAccess::ImplCreate).
The solution is to perform this further attemp in Bitmap::Checksum when
the value returned by ImpBitmap::GetChecksum is 0.
Change-Id: Ib901ac941db57756e9a951bacbc573ca206316e0
Reviewed-on: https://gerrit.libreoffice.org/38167
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 8dc4bd07e0d3..71d5d73f15ab 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -275,6 +275,21 @@ BitmapChecksum Bitmap::GetChecksum() const
if( mxImpBmp )
{
nRet = mxImpBmp->ImplGetChecksum();
+
+if (!nRet)
+{
+// nRet == 0 => probably, we were not able to acquire
+// the buffer in SalBitmap::updateChecksum;
+// so, we need to update the imp bitmap for this bitmap instance
+// as we do in BitmapInfoAccess::ImplCreate
+std::shared_ptr xNewImpBmp(new ImpBitmap);
+if (xNewImpBmp->ImplCreate(*mxImpBmp, GetBitCount()))
+{
+Bitmap* pThis = const_cast(this);
+pThis->mxImpBmp = xNewImpBmp;
+nRet = mxImpBmp->ImplGetChecksum();
+}
+}
}
return nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/unix/misc/senddoc.sh |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ac82ba97f330e1675931ae9a25f96a3255d18d89
Author: Stephan Bergmann
Date: Tue May 30 18:16:29 2017 +0200
Revert those quotes that look broken
...from 2b916da6cdcf3f7abe7e10f83321576ae2695954 "tdf#105204 fix shellcheck
warning in shell/source/unix/misc/senddoc.sh"
Change-Id: Iad55c5f4ff97f39ba117e525f2e660b537b00367
diff --git a/shell/source/unix/misc/senddoc.sh
b/shell/source/unix/misc/senddoc.sh
index 02e95423561d..372cee475fe2 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -337,7 +337,7 @@ case $(basename "$MAILER" | sed 's/-.*$//') in
shift;
done
-${MAILER} "${TO:+-T}" "${TO:-}" "${ATTACH:+-a}"
"${ATTACH:+"${ATTACH}"}"
+${MAILER} ${TO:+-T} ${TO:-} ${ATTACH:+-a} ${ATTACH:+"${ATTACH}"}
;;
sylpheed | claws)
@@ -358,7 +358,7 @@ case $(basename "$MAILER" | sed 's/-.*$//') in
shift;
done
- ${MAILER} "${TO:+--compose}" "${TO:-}" "${ATTACH:+--attach}"
"${ATTACH:-}"
+ ${MAILER} ${TO:+--compose} ${TO:-} ${ATTACH:+--attach} ${ATTACH:-}
;;
Mail | Thunderbird | *.app )
@@ -375,7 +375,7 @@ case $(basename "$MAILER" | sed 's/-.*$//') in
esac
shift;
done
-/usr/bin/open -a "${MAILER}" "${ATTACH}"
+/usr/bin/open -a "${MAILER}" ${ATTACH}
;;
*)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/vclptr.hxx | 51 +
1 file changed, 10 insertions(+), 41 deletions(-)
New commits:
commit c1a7994d64648c222de2785ca5f30c549ba3443c
Author: Stephan Bergmann
Date: Tue May 30 15:56:30 2017 +0200
Use std::is_base_of instead of own UpCast
...and no need here to wrap code in
/// @cond INTERNAL
Change-Id: I4bc613728c73deab3fe1e22ccd0c3fad51252ce8
Reviewed-on: https://gerrit.libreoffice.org/38221
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index b212fbd42177..f809176a77d4 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -35,43 +35,10 @@
#endif
#endif
-/// @cond INTERNAL
-namespace vcl { namespace detail {
-
-// A mechanism to enable up-casts, used by the VclReference conversion
constructor,
-// heavily borrowed from boost::is_base_and_derived
-// (which manages to avoid compilation problems with ambiguous bases and cites
-// comp.lang.c++.moderated mail "SuperSubclass
-// (is_base_and_derived) complete implementation!" by Rani Sharoni and cites
-// Aleksey Gurtovoy for the workaround for MSVC), to avoid including Boost
-// headers in URE headers (could ultimately be based on C++11 std::is_base_of):
-
-template< typename T1, typename T2 > struct UpCast {
-private:
-template< bool, typename U1, typename > struct C
-{ typedef U1 t; };
-
-template< typename U1, typename U2 > struct C< false, U1, U2 >
-{ typedef U2 t; };
-
-struct S { char c[2]; };
-
-template< typename U > static char f(T2 *, U);
-static S f(T1 *, int);
-
-struct H {
-operator T1 * () const;
-operator T2 * ();
-};
-
-public:
-static bool const value = sizeof (f(H(), 0)) == 1;
-typedef typename C< value, void *, void >::t t;
-};
-
#if !(defined _MSC_VER && _MSC_VER <= 1900 && !defined __clang__)
+namespace vcl { namespace detail {
+
template
constexpr bool isIncompleteOrDerivedFromVclReferenceBase(...) { return true; }
@@ -79,11 +46,9 @@ template constexpr bool
isIncompleteOrDerivedFromVclReferenceBase(
int (*)[sizeof(T)])
{ return std::is_base_of::value; }
-#endif
-
}; }; // namespace detail, namespace vcl
-/// @endcond
+#endif
/**
* A thin wrapper around rtl::Reference to implement the acquire and dispose
semantics we want for references to vcl::Window subclasses.
@@ -134,7 +99,9 @@ public:
template< class derived_type >
VclPtr(
const VclPtr< derived_type > & rRef,
-typename ::vcl::detail::UpCast< reference_type, derived_type >::t = 0 )
+typename std::enable_if<
+std::is_base_of::value, int>::type
+= 0 )
: m_rInnerRef( static_cast(rRef) )
{
}
@@ -198,7 +165,7 @@ public:
*/
template
typename std::enable_if<
-vcl::detail::UpCast::value,
+std::is_base_of::value,
VclPtr &>::type
operator =(VclPtr const & rRef)
{
@@ -373,7 +340,9 @@ public:
template< class derived_type >
ScopedVclPtr(
const VclPtr< derived_type > & rRef,
-typename ::vcl::detail::UpCast< reference_type, derived_type >::t = 0 )
+typename std::enable_if<
+std::is_base_of::value, int>::type
+= 0 )
: VclPtr( rRef )
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl sw/source
include/vcl/vclptr.hxx | 16
sw/source/uibase/inc/fldwrap.hxx |4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit ac5ff992409944f6d2f828290b574261a691a0ed
Author: Stephan Bergmann
Date: Tue May 30 18:19:34 2017 +0200
Dispose pDlgInterface member during destruction
Requires a VclPtr -> ScopedVclPtr assignment operator, similar to the
existing
VclPtr -> ScopedVclPtr constructor.
Change-Id: I2b43967ee84f90eea20f8eaa17741229473752b1
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index f809176a77d4..a11552635082 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -347,6 +347,22 @@ public:
{
}
+/** Up-casting assignment operator.
+
+Does not work for up-casts to ambiguous bases.
+
+@param rRef another VclPtr
+*/
+template
+typename std::enable_if<
+std::is_base_of::value,
+ScopedVclPtr &>::type
+operator =(VclPtr const & rRef)
+{
+disposeAndReset(rRef.get());
+return *this;
+}
+
/**
* Override and disallow this, to prevent people accidentally calling it
and actually
* getting VclPtr::Create and getting a naked VclPtr<> instance
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 0ebd58b45a45..0d8b58e7142c 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -25,7 +25,7 @@ class AbstractSwFieldDlg;
class SwFieldDlgWrapper : public SwChildWinWrapper
{
public:
-VclPtr pDlgInterface;
+ScopedVclPtr pDlgInterface;
SwFieldDlgWrapper( vcl::Window* pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
@@ -39,7 +39,7 @@ public:
class SwFieldDataOnlyDlgWrapper : public SwChildWinWrapper
{
public:
-VclPtr pDlgInterface;
+ScopedVclPtr pDlgInterface;
SwFieldDataOnlyDlgWrapper( vcl::Window* pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source
sw/source/uibase/app/apphdl.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 824426811897347d8a9aacff4f304572cec1473c
Author: Jan Holesovsky
Date: Tue May 30 10:19:16 2017 +0200
tdf#107729: Disable toolbar items that are not available yet.
Otherwise trying to use them crashes LibreOffice.
Change-Id: I268e5b783905ec7aaaf50cbc629fd44e6341bf8d
Reviewed-on: https://gerrit.libreoffice.org/38185
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 61a9e31b9f08..5abd1de7c9fa 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -248,6 +248,9 @@ void SwModule::StateOther(SfxItemSet &rSet)
// #i51949# hide e-Mail option if e-Mail is not supported
// #i63267# printing might be disabled
if (!xConfigItem ||
+!xConfigItem->GetResultSet().is() ||
+xConfigItem->GetCurrentDBData().sDataSource.isEmpty() ||
+xConfigItem->GetCurrentDBData().sCommand.isEmpty() ||
(nWhich == FN_MAILMERGE_PRINT_DOCUMENTS &&
Application::GetSettings().GetMiscSettings().GetDisablePrinting()) ||
(nWhich == FN_MAILMERGE_EMAIL_DOCUMENTS &&
!xConfigItem->IsMailAvailable()))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - icon-themes/sifr
icon-themes/sifr/cmd/32/insertreferencefield.png |binary icon-themes/sifr/cmd/32/showtrackchanges.png |binary 2 files changed New commits: commit f764e6019429b3133ba842c66f783fc3419a8e4c Author: Matthias Freund Date: Tue May 30 00:11:49 2017 +0200 tdf#75256 - Sifr icon theme 32px Change-Id: I2c67c2685caca8b92d0b662d05d3d831499195b6 Reviewed-on: https://gerrit.libreoffice.org/38174 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/icon-themes/sifr/cmd/32/insertreferencefield.png b/icon-themes/sifr/cmd/32/insertreferencefield.png new file mode 100644 index ..6e862fc00651 Binary files /dev/null and b/icon-themes/sifr/cmd/32/insertreferencefield.png differ diff --git a/icon-themes/sifr/cmd/32/showtrackchanges.png b/icon-themes/sifr/cmd/32/showtrackchanges.png new file mode 100644 index ..a5daa8a88aab Binary files /dev/null and b/icon-themes/sifr/cmd/32/showtrackchanges.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/32/insertreferencefield.png |binary icon-themes/sifr/cmd/32/showtrackchanges.png |binary 2 files changed New commits: commit b6bf9b12a63e22d718d6d8ad143d2095ca18017e Author: Matthias Freund Date: Tue May 30 00:11:49 2017 +0200 tdf#75256 - Sifr icon theme 32px Change-Id: I2c67c2685caca8b92d0b662d05d3d831499195b6 Reviewed-on: https://gerrit.libreoffice.org/38173 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/icon-themes/sifr/cmd/32/insertreferencefield.png b/icon-themes/sifr/cmd/32/insertreferencefield.png new file mode 100644 index ..6e862fc00651 Binary files /dev/null and b/icon-themes/sifr/cmd/32/insertreferencefield.png differ diff --git a/icon-themes/sifr/cmd/32/showtrackchanges.png b/icon-themes/sifr/cmd/32/showtrackchanges.png new file mode 100644 index ..a5daa8a88aab Binary files /dev/null and b/icon-themes/sifr/cmd/32/showtrackchanges.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - android/source
android/source/AndroidManifest.xml
|2 ++
android/source/build.gradle
|8
android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
|4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit bffb5437b48327a0572d905c792bbcc5f1f25f9a
Author: Christian Lohmaier
Date: Tue May 30 18:30:29 2017 +0200
enable the Action/Toolbar for Settings screens
by using a theme that has it enabled
Change-Id: Icf3b66d38de55e2b08d4e4ced463bab045e56c43
diff --git a/android/source/AndroidManifest.xml
b/android/source/AndroidManifest.xml
index 56fe63d62008..0b384a3becc2 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -95,6 +95,7 @@
@@ -109,6 +110,7 @@
diff --git
a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
index 7b2160a3f509..b842e79fafd6 100644
---
a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
+++
b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
@@ -14,7 +14,6 @@ import java.util.Set;
import org.libreoffice.R;
import org.libreoffice.storage.external.BrowserSelectorActivity;
-import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.os.Bundle;
@@ -22,8 +21,9 @@ import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
+import android.support.v7.app.AppCompatActivity;
-public class DocumentProviderSettingsActivity extends Activity {
+public class DocumentProviderSettingsActivity extends AppCompatActivity {
public static final String KEY_PREF_OWNCLOUD_SERVER = "pref_server_url";
public static final String KEY_PREF_OWNCLOUD_USER_NAME = "pref_user_name";
commit cb57abf33ffd2a76f67498b452f11d0f38e08054
Author: Christian Lohmaier
Date: Tue May 30 18:27:08 2017 +0200
android: bump build-tools, support-lib and gradle-plugin versions
Change-Id: Ib9fa2a3ca0ad4ba5075c9c25e5b2cba1e0e7285a
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 302d34a54754..92c6680f464a 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
-classpath 'com.android.tools.build:gradle:2.3.0'
+classpath 'com.android.tools.build:gradle:2.3.2'
}
}
@@ -24,14 +24,14 @@ dependencies {
])
compile files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
compile
files("${liboWorkdir}/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar")
-compile 'com.android.support:appcompat-v7:25.1.0'
-compile 'com.android.support:design:25.1.0'
+compile 'com.android.support:appcompat-v7:25.3.1'
+compile 'com.android.support:design:25.3.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
}
android {
compileSdkVersion 25
-buildToolsVersion "25.0.1"
+buildToolsVersion "25.0.3"
compileOptions {
// silence some java-language features hints
sourceCompatibility 6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help system improvements (II)
Em 30/05/2017 11:54, Jan Holesovsky escreveu:
> Hi Cloph,
>
> Christian Lohmaier píše v Út 30. 05. 2017 v 16:15 +0200:
>
1) issue with offline use (file://path/to/pages/)
>>>
>>> What exactly is the issue, please?
>>
>> browsers blocking loading of local files for security reason.
>>
To do:
3) Resolve protocol file:// for offline use (hit CORS guideline
restriction for browsers)
>>>
>>> What exactly is needed here, please?
>>
>> for chromium, one could make the help an extension package, that way
>> it would be allowed to load files from a configured directory (in
>> other words: add a corresponding manifest file)
>>
>> see also
>> https://bugs.chromium.org/p/chromium/issues/detail?id=40787
>
> That was the problem with loading data via XMLHTTPRequest / jquery's
> load (we were trying to solve previously); but if the files are static
> html now, I see no problem to link directly ( href="something/blah">...), which does not have this problem :-)
>
> Or am I missing something?
>
The issue is to dynamically load the bookmark_.html file in the
page. Currently the JS solution is
$("#BottomLeft").load('bookmark_'+module+'.html');
(I tested replacing it by or but that brings other
issues. I also tested < link rel="imports" bookmark.../> but I also hit
restrictions on browsers (http://caniuse.com/#feat=imports) )
Regards
--
Olivier Hallot
LibreOffice Documentation Coordinator
Comunidade LibreOffice
Rio de Janeiro - Brasil - Local Time: UTC-03:00
http://tdf.io/joinus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/prltempl.cxx | 44 ++
sd/source/ui/func/futempl.cxx | 27 +++--
2 files changed, 48 insertions(+), 23 deletions(-)
New commits:
commit 4c5ce12608526e76d90a400fa3f499ab83528e90
Author: Rohan Kumar
Date: Sun Apr 9 03:43:38 2017 +0530
Fix highlighting in sd::FuTemplate
sd::FuTemplate Highlighting tab's colors don't stick anymore.
Change-Id: Idb1701ddf1f7d47758a4ef8ebe6705ee6ff16c11
Reviewed-on: https://gerrit.libreoffice.org/35800
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 3573b27bd929..0f5e3db0c55b 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include "DrawDocShell.hxx"
@@ -63,6 +64,8 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(
SfxObjectShell* pDocSh,
pOutSet ( nullptr ),
pOrgSet ( &rStyleBase.GetItemSet() )
{
+const SfxPoolItem *pItem = nullptr;
+
if( IS_OUTLINE(ePO))
{
// Unfortunately, the Itemsets of our style sheets are not discreet..
@@ -93,7 +96,6 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(
SfxObjectShell* pDocSh,
pOutSet = new SfxItemSet( rStyleBase.GetItemSet() );
pOutSet->ClearItem();
-const SfxPoolItem *pItem = nullptr;
// If there is no bullet item in this stylesheet, we get it
// from 'Outline 1' style sheet.
@@ -110,10 +112,44 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(
SfxObjectShell* pDocSh,
// preselect selected layer in dialog
aInputSet.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL,
1GetValue();
+/* make new SvxBrushItem with this Color */
+SvxBrushItem aBrushItem( aBackColor, SID_ATTR_BRUSH_CHAR );
+
+aInputSet.ClearItem( EE_CHAR_BKGCOLOR );
+/* and stick it into the set */
+aInputSet.Put( aBrushItem );
+}
}
-else
-SetInputSet( pOrgSet );
+else {
+/*
+ * same here
+ */
+aInputSet.SetRanges(pOrgSet->GetRanges());
+aInputSet.MergeRange(SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR);
+aInputSet.Put(*pOrgSet, false);
+if ( pOrgSet->GetItemState( EE_CHAR_BKGCOLOR, true, &pItem ) ==
SfxItemState::SET )
+{
+/* extract Color outta SvxBackColorItem */
+Color aBackColor = static_cast(pItem)->GetValue();
+/* make new SvxBrushItem with this Color */
+SvxBrushItem aBrushItem( aBackColor, SID_ATTR_BRUSH_CHAR );
+
+aInputSet.ClearItem( EE_CHAR_BKGCOLOR );
+/* and stick it into the set */
+aInputSet.Put( aBrushItem );
+}
+}
+SetInputSet( &aInputSet );
SvxColorListItem aColorListItem(*static_cast(
mpDocShell->GetItem( SID_COLOR_TABLE ) ) );
SvxGradientListItem aGradientListItem(*static_cast( mpDocShell->GetItem( SID_GRADIENT_LIST ) ) );
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 51a074342c25..3a5ce9adb82e 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -105,10 +105,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
SfxStyleSheetBase* pStyleSheet = nullptr;
const SfxPoolItem* pItem;
-static const sal_uInt16 aRanges[] = {
-EE_ITEMS_START, EE_ITEMS_END,
-SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR
-};
SfxStyleFamily nFamily = (SfxStyleFamily)USHRT_MAX;
if( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_STYLE_FAMILY,
false, &pItem ))
@@ -305,15 +301,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
ScopedVclPtr pPresDlg;
SdAbstractDialogFactory* pFact =
SdAbstractDialogFactory::Create();
bool bOldDocInOtherLanguage = false;
-SfxItemSet aNewAttr(mpViewShell->GetPool(), aRanges);
-
-if( aNewAttr.GetItemState( XATTR_FILLBACKGROUND, true, &pItem
) == SfxItemState::SET)
-{
-Color aBackColor = static_cast(pItem)->GetValue();
-SvxBrushItem aBrushItem(aBackColor, XATTR_FILLBACKGROUND);
-aNewAttr.ClearItem(XATTR_FILLBACKGROUND);
-aNewAttr.Put(aBrushItem);
-}
SfxStyleFamily eFamily = pStyleSheet->GetFamily();
@@ -412,15 +399,17 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
if (eFamily == SD_STYLE_FAMILY_PSEUDO)
{
[Libreoffice-commits] core.git: sc/sdi sc/source
sc/sdi/formatsh.sdi|2 +-
sc/source/ui/view/formatsh.cxx | 11 ++-
sc/source/ui/view/tabview3.cxx |1 +
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 82beda528fb74ae1c6b5e12a98dbf5d4e9e4c0db
Author: Gulsah Kose
Date: Tue May 30 15:45:24 2017 +0300
tdf#86119 Fix toggle behaviour of SID_NUMBER_STANDARD.
Change-Id: I718869c92a3a03c05b8db3fe665f5502202f434b
Signed-off-by: Gulsah Kose
Reviewed-on: https://gerrit.libreoffice.org/38217
Tested-by: Jenkins
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index 3663955aadfa..54771a8dbb80 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -110,7 +110,7 @@ interface FormatForSelection
SID_NUMBER_CURRENCY [ ExecMethod = ExecuteNumFormat; StateMethod =
GetNumFormatState; ]
SID_NUMBER_PERCENT [ ExecMethod = ExecuteNumFormat; StateMethod =
GetNumFormatState; ]
SID_NUMBER_TIME [ ExecMethod = ExecuteNumFormat; StateMethod =
GetNumFormatState; ]
-SID_NUMBER_STANDARD [ ExecMethod = ExecuteNumFormat;]
+SID_NUMBER_STANDARD [ ExecMethod = ExecuteNumFormat; StateMethod =
GetNumFormatState; ]
SID_NUMBER_INCDEC [ ExecMethod = ExecuteNumFormat;]
SID_NUMBER_DECDEC [ ExecMethod = ExecuteNumFormat;]
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 259338a37ab4..cef3eab48bc3 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1127,7 +1127,9 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
rReq.Done();
break;
case SID_NUMBER_STANDARD:
-pTabViewShell->SetNumberFormat( css::util::NumberFormat::NUMBER );
+if (!(nType & css::util::NumberFormat::NUMBER))
+pTabViewShell->SetNumberFormat(
css::util::NumberFormat::NUMBER );
+rBindings.Invalidate( nSlot );
rReq.Done();
break;
case SID_NUMBER_INCDEC:
@@ -2637,6 +2639,13 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
rSet.Put( SfxBoolItem(nWhich, (nType &
css::util::NumberFormat::NUMBER) && nNumberFormat == 4 ) );
}
break;
+case SID_NUMBER_STANDARD:
+{
+const SfxItemSet& rAttrSet =
pTabViewShell->GetSelectionPattern()->GetItemSet();
+sal_uInt32 nNumberFormat = static_cast(rAttrSet.Get(ATTR_VALUE_FORMAT)).GetValue();
+rSet.Put( SfxBoolItem(nWhich, (nType &
css::util::NumberFormat::NUMBER) && nNumberFormat == 0 ) );
+}
+break;
}
nWhich = aIter.NextWhich();
}
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 429f34e1017e..de638447b567 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -322,6 +322,7 @@ void ScTabView::InvalidateAttribs()
rBindings.Invalidate( SID_NUMBER_PERCENT );
rBindings.Invalidate( SID_NUMBER_TWODEC );
rBindings.Invalidate( SID_NUMBER_TIME );
+rBindings.Invalidate( SID_NUMBER_STANDARD );
}
// SetCursor - Cursor, set, draw, update InputWin
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - vcl/source
vcl/source/gdi/bitmap.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 2cc070ccf1347dcd0cfff048d8bf3cc9c29cc3bd
Author: Marco Cecchetti
Date: Mon May 29 21:07:10 2017 +0200
tdf#107682 - Repeated images replace correct ones in exported PDF
The problem was due to the buffer acquire methods: in Bitmap::Checksum
(old implementation) Bitmap::AcquireReadAccess is used to get the bitmap
buffer: indeed this method relies on SalBitmap::AcquireBuffer (which is
used in the new implementation) but in case the buffer acquisition
fails, instead of giving up, it tries to update the imp bitmap instance
embedded in the bitmap (see BitmapInfoAccess::ImplCreate).
The solution is to perform this further attemp in Bitmap::Checksum when
the value returned by ImpBitmap::GetChecksum is 0.
Change-Id: Ib901ac941db57756e9a951bacbc573ca206316e0
Reviewed-on: https://gerrit.libreoffice.org/38169
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index cf0bf70343e3..b5641b82857d 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -285,6 +285,21 @@ BitmapChecksum Bitmap::GetChecksum() const
if( mxImpBmp )
{
nRet = mxImpBmp->ImplGetChecksum();
+
+if (!nRet)
+{
+// nRet == 0 => probably, we were not able to acquire
+// the buffer in SalBitmap::updateChecksum;
+// so, we need to update the imp bitmap for this bitmap instance
+// as we do in BitmapInfoAccess::ImplCreate
+std::shared_ptr xNewImpBmp(new ImpBitmap);
+if (xNewImpBmp->ImplCreate(*mxImpBmp, GetBitCount()))
+{
+Bitmap* pThis = const_cast(this);
+pThis->mxImpBmp = xNewImpBmp;
+nRet = mxImpBmp->ImplGetChecksum();
+}
+}
}
return nRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - configure.ac external/coinmp external/cppunit external/curl external/lcms2 external/libgltf external/nss external/openssl external/poppler external/python3
configure.ac |7 external/coinmp/ExternalProject_coinmp.mk |1 external/cppunit/ExternalProject_cppunit.mk|1 external/curl/ExternalProject_curl.mk |2 external/curl/UnpackedTarball_curl.mk |1 external/curl/curl-xp.patch.1 | 12 external/lcms2/ExternalProject_lcms2.mk|1 external/libgltf/ExternalProject_libgltf.mk|1 external/nss/UnpackedTarball_nss.mk|2 external/nss/nss-winXP-sdk.patch.1 | 12 external/openssl/opensslwnt.patch | 12 external/poppler/ExternalProject_poppler.mk|2 external/python3/ExternalProject_python3.mk|1 external/python3/python-3.3.0-gcc-4.8.patch.1 | 16 external/python3/python-3.3.0-msvc-x64.patch.1 | 289 - external/python3/python-3.3.0-msvc2012.patch.1 | 72 external/python3/python-3.3.3-msvc2012-winxp.patch.1 | 117 -- external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 | 12 fpicker/Library_fps.mk |2 fpicker/source/win32/filepicker/platform_vista.h |7 sal/Module_sal.mk |2 sal/osl/w32/socket.cxx | 117 -- sd/source/ui/remotecontrol/DiscoveryService.cxx|2 solenv/gbuild/platform/com_MSC_defs.mk |1 solenv/gbuild/platform/windows.mk | 10 vcl/source/gdi/pdfwriter_impl.cxx | 27 - vcl/win/app/salinst.cxx| 90 ++--- 27 files changed, 47 insertions(+), 772 deletions(-) New commits: commit 656c8754abc6678e5efcaa1fec1dcac0a01ca54c Author: Michael Stahl Date: Tue May 30 17:49:54 2017 +0200 sal,external: remove checks for obsolete VCVER=120 Change-Id: I4d32b7c4b2e545a8d979bc516f64cfcbf66ecd07 diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index 53d886510ece..ead6c6d1506c 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) : MSBuild.exe CoinMP.sln /t:Build \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ - $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \ $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \ $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \ $(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 2a5a934d384e..b199accd1ed6 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -18,7 +18,6 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_ExternalProject_run,build,\ PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ - $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \ $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \ $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \ $(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 250255ff11cd..0e8fa4fb631f 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -18,7 +18,6 @@ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_run,build,\ MSBuild.exe lcms2_DLL.vcxproj \ - $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \ $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \ $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \ $(if $(filter 150-10,$(VCVER)-$(WINDOWS_S
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source
sw/source/uibase/docvw/edtdd.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 78f84a9a92f8dcd50747480d931f60c58b2344ec
Author: Armin Le Grand
Date: Fri May 26 11:49:58 2017 +0200
tdf#106131 no global drag when anchor drag active
If in Writer dragging the anchor is already active
it is not allowed to enter global object drag mode.
This check was missing and may lead to various
inconsistencies
Change-Id: I7d8dd2a62737e6d5d72f69747ceb21bcb73c45ed
Reviewed-on: https://gerrit.libreoffice.org/38059
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
(cherry picked from commit 1b27bed2d5b6915cda408c6f8d27d15bf13cc9be)
Reviewed-on: https://gerrit.libreoffice.org/38188
Tested-by: Armin Le Grand
(cherry picked from commit c3c208e1fdfd60b95fc09ed48d9ee975bddb214d)
Reviewed-on: https://gerrit.libreoffice.org/38209
Reviewed-by: Michael Stahl
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index 4a496dacba7d..62ab5bfb0cb5 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -88,11 +88,17 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const
Point& rPosPixel )
//We are not selecting and aren't at a selection
bStart = true;
else if ( !g_bFrameDrag && rSh.IsSelFrameMode() &&
-rSh.IsInsideSelectedObj( aDocPos ) )
+rSh.IsInsideSelectedObj( aDocPos ) &&
+nullptr == m_pAnchorMarker)
{
//We are not dragging internally and are not at an
//object (frame, draw object)
+// tdf#106131 *and* AnchorDrag is *not* active: When active,
+// entering global drag mode will destroy the AnchorHdl but
+// keep the now invalid ptr in place, next access will crash.
+// It is indeed wrong to enter drag mode when AnchorDrag is
+// already active
bStart = true;
}
else if( !g_bFrameDrag && m_rView.GetDocShell()->IsReadOnly() &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source chart2/source connectivity/source cui/source dbaccess/source extensions/source forms/source oox/source sc/source sd/source sfx2/source svl/source svx/sou
bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx |2 -
bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx |2 -
chart2/source/controller/dialogs/dlg_ChartType.cxx |1
connectivity/source/commontools/dbtools.cxx|7
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx |1
cui/source/options/treeopt.cxx |1
dbaccess/source/filter/xml/xmlExport.cxx | 17
+++---
dbaccess/source/ui/querydesign/querycontroller.cxx |5 --
extensions/source/bibliography/bibbeam.cxx |2 -
forms/source/component/Grid.cxx|1
oox/source/export/drawingml.cxx|1
oox/source/vml/vmlshape.cxx|1
sc/source/core/tool/compiler.cxx |1
sc/source/filter/html/htmlexp.cxx |1
sc/source/filter/oox/pivottablebuffer.cxx |4 --
sd/source/ui/remotecontrol/Receiver.cxx|1
sd/source/ui/view/ViewShellBase.cxx| 13 ++-
sfx2/source/appl/workwin.cxx |1
svl/source/numbers/zforlist.cxx|6 ---
svx/source/fmcomp/fmgridif.cxx |1
svx/source/fmcomp/xmlexchg.cxx |1
svx/source/form/datanavi.cxx |2 -
svx/source/form/fmPropBrw.cxx | 17
--
sw/source/core/doc/tblrwcl.cxx |2 -
sw/source/filter/ww8/ww8par.cxx|9 -
sw/source/ui/dbui/mmoutputtypepage.cxx |1
sw/source/ui/index/swuiidxmrk.cxx |1
sw/source/uibase/app/swmodule.cxx |3 -
sw/source/uibase/shells/annotsh.cxx|2 -
toolkit/source/awt/vclxwindow.cxx |2 -
unotools/source/i18n/localedatawrapper.cxx |1
vcl/source/window/accessibility.cxx|2 -
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |2 -
vcl/workben/mtfdemo.cxx|2 -
vcl/workben/vcldemo.cxx|2 -
xmloff/source/chart/SchXMLExport.cxx |1
36 files changed, 20 insertions(+), 99 deletions(-)
New commits:
commit 709040e0adf0a533700576b14c8498f986a601e9
Author: Jochen Nitschke
Date: Tue May 30 10:57:29 2017 +0200
remove duplicate 'using namespace'
Change-Id: I7f8828f677cfb588135ff75c03ffb75895773440
Reviewed-on: https://gerrit.libreoffice.org/38201
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index 8caba36ab7fb..c434f5d9fbc4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -57,8 +57,6 @@ using namespace ::rtl;
#define IS_BIG_ENDIAN 0
#endif
-using namespace ::com::sun::star::uno;
-
namespace
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
index 13f67594c981..7b1f4ef27b93 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx
@@ -52,8 +52,6 @@ using namespace ::rtl;
#include
#endif
-using namespace ::com::sun::star::uno;
-
namespace CPPU_CURRENT_NAMESPACE
{
bool is_complex_struct(const typelib_TypeDescription * type)
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx
b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index fa260e003022..96c10ebc9710 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -26,7 +26,6 @@
#include
#include
-using namespace ::com::sun::star;
namespace chart
{
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 35b5bf818b6c..97316e5e2536 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -99,17 +99,12 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::task;
using namespace ::com::sun::star::form;
using namespace connectivity;
namespace dbtools
{
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star:
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/rtfimport/data/tdf106950.rtf |8
sw/qa/extras/rtfimport/rtfimport.cxx|9 +
sw/source/core/unocore/unomapproperties.hxx |1 +
3 files changed, 18 insertions(+)
New commits:
commit 278bfe012a0e465cb8d08957fc07d2e5dcebdc81
Author: Miklos Vajna
Date: Tue May 30 12:48:52 2017 +0200
tdf#106950 sw: support CharShadingValue property on paragraph styles
Regression from commit 26d40686128e70916a636e20f5ccc5763bbb6cc8
(fdo65400: fix for Character Shading being lost, 2013-06-23), though
much more visible since commit a9e029ace41562e28e9242d63230ad1ca275f5d3
(tdf#104744 RTF import: fix unexpected zero para left margin wrt style
dedup, 2017-01-03), when I fixed the RTF filter to not duplicate the
"align paragraph to center" paragraph style property as a direct
formatting as well.
The problem was that the CharShadingValue property was not added as a
paragraph style property, while in general all character properties are
also allowed on paragraphs and paragraph styles as well.
Change-Id: If1bdad96e45adc545a81a1f550ab7ccb3591c4f6
Reviewed-on: https://gerrit.libreoffice.org/38210
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/rtfimport/data/tdf106950.rtf
b/sw/qa/extras/rtfimport/data/tdf106950.rtf
new file mode 100644
index ..8ebaa3ce100f
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf106950.rtf
@@ -0,0 +1,8 @@
+{\rtf1
+{\stylesheet
+{\s20\chcbpat2\qc Title;}
+}
+\plain\plain\s20\chcbpat2\qc\plain
+hello
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8cefb3af2cfa..90fe265d8238 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2827,6 +2827,15 @@ DECLARE_RTFIMPORT_TEST(testTdf107116, "tdf107116.rtf")
CPPUNIT_ASSERT_EQUAL(static_cast(convertTwipToMm100(120)),
getProperty(getParagraph(2), "TopBorderDistance"));
}
+DECLARE_RTFIMPORT_TEST(testTdf106950, "tdf106950.rtf")
+{
+uno::Reference xPara(getParagraph(1));
+// This was ParagraphAdjust_LEFT, trying to set CharShadingValue on a
+// paragraph style thrown an exception, and remaining properties were not
+// set.
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_cast(getProperty(xPara,
"ParaAdjust")));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unomapproperties.hxx
b/sw/source/core/unocore/unomapproperties.hxx
index b8b3091464d0..633fd3db3e2e 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -400,6 +400,7 @@
{ OUString(UNO_NAME_PARA_BOTTOM_MARGIN_RELATIVE),
RES_UL_SPACE, cppu::UnoType::get(), PROPERTY_NONE,
MID_LO_REL_MARGIN},\
TABSTOPS_MAP_ENTRY\
{ OUString(UNO_NAME_CHAR_WORD_MODE),
RES_CHRATR_WORDLINEMODE,cppu::UnoType::get() ,PROPERTY_NONE, 0},\
+{ OUString(UNO_NAME_CHAR_SHADING_VALUE),
RES_CHRATR_BACKGROUND, cppu::UnoType::get(), PROPERTY_NONE,
MID_SHADING_VALUE }, \
{ OUString(UNO_NAME_CHAR_LEFT_BORDER), RES_CHRATR_BOX,
cppu::UnoType::get(), PROPERTY_NONE, LEFT_BORDER
|CONVERT_TWIPS },\
{ OUString(UNO_NAME_CHAR_RIGHT_BORDER), RES_CHRATR_BOX,
cppu::UnoType::get(), PROPERTY_NONE, RIGHT_BORDER
|CONVERT_TWIPS },\
{ OUString(UNO_NAME_CHAR_TOP_BORDER), RES_CHRATR_BOX,
cppu::UnoType::get(), PROPERTY_NONE, TOP_BORDER
|CONVERT_TWIPS },\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/AnnotationManager.js | 16
1 file changed, 16 insertions(+)
New commits:
commit 143afd674a6a18d2a2618d419a3a1f259fc1a8b3
Author: Henry Castro
Date: Tue May 30 15:59:00 2017 -0400
loleaflet: merge comments and redlines items
Comments and Redlines were mutually exclusive, but a document
can contain both.
Change-Id: Idb13f0c0e1216edc6bed3291c0c486b45ad74b56
diff --git a/loleaflet/src/layer/AnnotationManager.js
b/loleaflet/src/layer/AnnotationManager.js
index 3ef0dc8a..7dc2e5c6 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -118,12 +118,20 @@ L.AnnotationManager = L.Class.extend({
fill: function (comments) {
var comment;
this.clear();
+ // items contains redlines
+ var ordered = !this._items.length > 0;
for (var index in comments) {
comment = comments[index];
this.adjustComment(comment);
this._items.push(L.annotation(this._map.options.maxBounds.getSouthEast(),
comment).addTo(this._map));
}
if (this._items.length > 0) {
+ if (!ordered) {
+ this._items.sort(function(a, b) {
+ return
Math.abs(a._data.anchorPos.min.y) - Math.abs(b._data.anchorPos.min.y) ||
+
Math.abs(a._data.anchorPos.min.x) - Math.abs(b._data.anchorPos.min.x);
+ });
+ }
this._map._docLayer._updateMaxBounds(true);
this.layout();
}
@@ -132,6 +140,8 @@ L.AnnotationManager = L.Class.extend({
fillChanges: function(redlines) {
var changecomment;
this.clearChanges();
+ // items contains comments
+ var ordered = !this._items.length > 0;
for (var idx in redlines) {
changecomment = redlines[idx];
if (!this.adjustRedLine(changecomment)) {
@@ -141,6 +151,12 @@ L.AnnotationManager = L.Class.extend({
this._items.push(L.annotation(this._map.options.maxBounds.getSouthEast(),
changecomment).addTo(this._map));
}
if (this._items.length > 0) {
+ if (!ordered) {
+ this._items.sort(function(a, b) {
+ return
Math.abs(a._data.anchorPos.min.y) - Math.abs(b._data.anchorPos.min.y) ||
+
Math.abs(a._data.anchorPos.min.x) - Math.abs(b._data.anchorPos.min.x);
+ });
+ }
this._map._docLayer._updateMaxBounds(true);
this.layout();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/unodraw/unoshtxt.cxx | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
New commits:
commit e55f887be63b00e0966cb34863bb5d52fcac6d1d
Author: Caolán McNamara
Date: Tue May 30 10:49:01 2017 +0100
Related: tdf#107961 ensure notifyhdl is unset after dispose
Change-Id: I69790c8d3cfffc09ee6d6c165e17823223c5058a
Reviewed-on: https://gerrit.libreoffice.org/38205
Tested-by: Julien Nabet
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 0d688e55bf3c..2c8d5c31ea90 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -101,6 +101,7 @@ private:
boolmbForwarderIsEditMode; // have to
reflect that, since ENDEDIT can happen more often
boolmbShapeIsEditMode; // only true,
if SdrHintKind::BeginEdit was received
boolmbNotificationsDisabled;// prevent
EditEngine/Outliner notifications (e.g. when setting up forwarder)
+boolmbNotifyEditOutlinerSet;
SvxUnoTextRangeBaseList maTextRanges;
@@ -173,7 +174,8 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject*
pObject, SdrText* pText
mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( false ),
-mbNotificationsDisabled ( false )
+mbNotificationsDisabled ( false ),
+mbNotifyEditOutlinerSet ( false )
{
DBG_ASSERT( mpObject, "invalid pObject!" );
@@ -209,7 +211,8 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject&
rObject, SdrText* pText
mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( true ),
-mbNotificationsDisabled ( false )
+mbNotificationsDisabled ( false ),
+mbNotifyEditOutlinerSet ( false )
{
if( !mpText )
{
@@ -390,7 +393,10 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC,
const SfxHint& rHint)
// register as listener - need to broadcast state change
messages
if( mpView && mpView->GetTextEditOutliner() )
+{
mpView->GetTextEditOutliner()->SetNotifyHdl(
LINK(this, SvxTextEditSourceImpl, NotifyHdl) );
+mbNotifyEditOutlinerSet = true;
+}
// Only now we're really in edit mode
mbShapeIsEditMode = true;
@@ -409,7 +415,10 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC,
const SfxHint& rHint)
// remove as listener - outliner might outlive ourselves
if( mpView && mpView->GetTextEditOutliner() )
+{
mpView->GetTextEditOutliner()->SetNotifyHdl(
Link() );
+mbNotifyEditOutlinerSet = false;
+}
// destroy view forwarder, OutlinerView no longer
// valid (no need for UpdateData(), it's been
@@ -483,6 +492,12 @@ void SvxTextEditSourceImpl::dispose()
if( mpView )
{
+// remove as listener - outliner might outlive ourselves
+if (mbNotifyEditOutlinerSet && mpView && mpView->GetTextEditOutliner())
+{
+
mpView->GetTextEditOutliner()->SetNotifyHdl(Link());
+mbNotifyEditOutlinerSet = false;
+}
EndListening( *mpView );
mpView = nullptr;
}
@@ -730,6 +745,7 @@ SvxDrawOutlinerViewForwarder*
SvxTextEditSourceImpl::CreateViewForwarder()
{
// register as listener - need to broadcast state change messages
mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this,
SvxTextEditSourceImpl, NotifyHdl) );
+mbNotifyEditOutlinerSet = true;
SdrTextObj* pTextObj = dynamic_cast( mpObject );
if( pTextObj )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source
svx/source/unodraw/unoshtxt.cxx | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
New commits:
commit e7ee5921b366d885b1f3edd617764730d2aa03d9
Author: Caolán McNamara
Date: Tue May 30 10:49:01 2017 +0100
Related: tdf#107961 ensure notifyhdl is unset after dispose
Change-Id: I69790c8d3cfffc09ee6d6c165e17823223c5058a
Reviewed-on: https://gerrit.libreoffice.org/38237
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 0d688e55bf3c..2c8d5c31ea90 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -101,6 +101,7 @@ private:
boolmbForwarderIsEditMode; // have to
reflect that, since ENDEDIT can happen more often
boolmbShapeIsEditMode; // only true,
if SdrHintKind::BeginEdit was received
boolmbNotificationsDisabled;// prevent
EditEngine/Outliner notifications (e.g. when setting up forwarder)
+boolmbNotifyEditOutlinerSet;
SvxUnoTextRangeBaseList maTextRanges;
@@ -173,7 +174,8 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject*
pObject, SdrText* pText
mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( false ),
-mbNotificationsDisabled ( false )
+mbNotificationsDisabled ( false ),
+mbNotifyEditOutlinerSet ( false )
{
DBG_ASSERT( mpObject, "invalid pObject!" );
@@ -209,7 +211,8 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject&
rObject, SdrText* pText
mbOldUndoMode ( false ),
mbForwarderIsEditMode ( false ),
mbShapeIsEditMode ( true ),
-mbNotificationsDisabled ( false )
+mbNotificationsDisabled ( false ),
+mbNotifyEditOutlinerSet ( false )
{
if( !mpText )
{
@@ -390,7 +393,10 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC,
const SfxHint& rHint)
// register as listener - need to broadcast state change
messages
if( mpView && mpView->GetTextEditOutliner() )
+{
mpView->GetTextEditOutliner()->SetNotifyHdl(
LINK(this, SvxTextEditSourceImpl, NotifyHdl) );
+mbNotifyEditOutlinerSet = true;
+}
// Only now we're really in edit mode
mbShapeIsEditMode = true;
@@ -409,7 +415,10 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC,
const SfxHint& rHint)
// remove as listener - outliner might outlive ourselves
if( mpView && mpView->GetTextEditOutliner() )
+{
mpView->GetTextEditOutliner()->SetNotifyHdl(
Link() );
+mbNotifyEditOutlinerSet = false;
+}
// destroy view forwarder, OutlinerView no longer
// valid (no need for UpdateData(), it's been
@@ -483,6 +492,12 @@ void SvxTextEditSourceImpl::dispose()
if( mpView )
{
+// remove as listener - outliner might outlive ourselves
+if (mbNotifyEditOutlinerSet && mpView && mpView->GetTextEditOutliner())
+{
+
mpView->GetTextEditOutliner()->SetNotifyHdl(Link());
+mbNotifyEditOutlinerSet = false;
+}
EndListening( *mpView );
mpView = nullptr;
}
@@ -730,6 +745,7 @@ SvxDrawOutlinerViewForwarder*
SvxTextEditSourceImpl::CreateViewForwarder()
{
// register as listener - need to broadcast state change messages
mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this,
SvxTextEditSourceImpl, NotifyHdl) );
+mbNotifyEditOutlinerSet = true;
SdrTextObj* pTextObj = dynamic_cast( mpObject );
if( pTextObj )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
