[Libreoffice-commits] core.git: bin/crashreportScraper.py

[tagezi (via logerrit)]

 bin/crashreportScraper.py |   17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 3cb921dece44e3e289fc73a64399c1a6c618259c
Author: tagezi 
AuthorDate: Fri May 27 21:25:13 2022 +0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 2 15:52:20 2022 +0200

crashreportScraper: Removed time parsing, now it just resets.

Change-Id: I39465cdbc14e28556760a0c1feab22d8998e4d16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135050
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/bin/crashreportScraper.py b/bin/crashreportScraper.py
index 1735aa3052b5..aec3e5e9cffb 100755
--- a/bin/crashreportScraper.py
+++ b/bin/crashreportScraper.py
@@ -24,15 +24,11 @@ def convert_str_to_date(value):
 value = value.replace('June', 'Jun')
 value = value.replace('July', 'Jul')
 value = value.replace('Sept', 'Sep')
-value = value.replace('noon', '12:00 pm')
+# reset the time leaving the date
+value = ", ".join(value.split(", ")[:-1])
+dtDate = datetime.strptime(value, '%b %d, %Y')
 
-if ':' not in value:
-if 'am' in value:
-value = value.replace(' am', ':00 am')
-elif 'pm' in value:
-value = value.replace(' pm', ':00 pm')
-
-return datetime.strptime(value, '%b %d, %Y, %H:%M %p')
+return dtDate.strftime('%y/%m/%d')
 
 def parse_version_url(url):
 crashReports = {}
@@ -193,7 +189,7 @@ if __name__ == '__main__':
 f.write(line)
 f.flush()
 
-for k, v in crashes.items():
+for k, lDate in crashes.items():
 if len(k) < 254 and k not in crashesInFile and '`' not in k:
 print("Parsing " + k)
 try:
@@ -201,10 +197,9 @@ if __name__ == '__main__':
 
"https://crashreport.libreoffice.org/stats/signature/; + k)
 crashReason, crashStack, codeLine = 
parse_details_and_get_info(
 
"https://crashreport.libreoffice.org/stats/crash_details/; + crashID, gitRepo)
-line = '\t'.join([k, str(crashCount), 
v[1].strftime('%y/%m/%d'), v[2].strftime('%y/%m/%d'),
+line = '\t'.join([k, str(crashCount), lDate[1], lDate[2],
 crashID, crashVersion, crashReason, crashOS, 
crashStack, codeLine, '\n'])
 f.write(line)
 f.flush()
 except requests.exceptions.Timeout:
 continue
-

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

[tagezi (via logerrit)]

/search_replace/tdf132783.py  |2 +-
 sc/qa/uitest/search_replace/tdf143759.py  |2 +-
 sc/qa/uitest/search_replace/tdf35020.py   |3 ---
 sc/qa/uitest/search_replace/tdf39959.py   |6 +-
 sc/qa/uitest/search_replace/tdf44861.py   |3 ---
 sc/qa/uitest/signatureLine/insertSignatureLine.py |3 ---
 sc/qa/uitest/sort/sorting.py  |2 +-
 sc/qa/uitest/sort/subtotals.py|4 
 sc/qa/uitest/sort/tdf105301.py|2 +-
 sc/qa/uitest/sort/tdf54018.py |3 ---
 sc/qa/uitest/statistics/anova.py  |3 ---
 sc/qa/uitest/statistics/chiSquare.py  |1 -
 sc/qa/uitest/statistics/correlation.py|1 -
 sc/qa/uitest/statistics/covariance.py |2 --
 sc/qa/uitest/statistics/exponentialSmoothing.py   |3 ---
 sc/qa/uitest/statistics/fTest.py  |1 -
 sc/qa/uitest/statistics/movingAverage.py  |3 ---
 sc/qa/uitest/statistics/regression.py |3 ---
 sc/qa/uitest/statistics/sampling.py   |2 --
 sc/qa/uitest/statistics/tTest.py  |1 -
 sc/qa/uitest/statistics/tdf76731.py   |4 
 sc/qa/uitest/statistics/zTest.py  |1 -
 sc/qa/uitest/textToColumns/textToColumns.py   |   12 
 sc/qa/uitest/validity/tdf137945.py|2 +-
 sc/qa/uitest/validity/tdf138134.py|1 -
 sc/qa/uitest/validity/tdf65686.py |2 --
 sc/qa/uitest/validity/tdf96698.py |8 
 106 files changed, 72 insertions(+), 325 deletions(-)

New commits:
commit c3baf2a7f48b5ee46c6792b3106cb4fedb4a2ad2
Author: tagezi 
AuthorDate: Fri May 27 13:00:39 2022 +0300
Commit: Xisco Fauli 
CommitDate: Mon May 30 09:48:46 2022 +0200

sc uitests: Cleaning up unused variables

Removed unused variables in the 'with' statement as the syntax
 allows the statement to be used without a variable.
Removed variables like 'xcomments' and 'xseedspin', which seem
 to have been copied and not cleaned up.
Removed variables 'gridwin' and 'xCalcDoc' if 'gridwin' is not used.

Change-Id: Ia97692a0fb2e2af1d2693e09ac8f7c614360ade8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135042
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/autofilter/autofilter.py 
b/sc/qa/uitest/autofilter/autofilter.py
index bbfbbaab7118..f892d2f901a8 100644
--- a/sc/qa/uitest/autofilter/autofilter.py
+++ b/sc/qa/uitest/autofilter/autofilter.py
@@ -61,7 +61,7 @@ class AutofilterTest(UITestCase):
 self.assertFalse(is_row_hidden(doc, 4))
 
 def test_tdf133160(self):
-with self.ui_test.load_file(get_url_for_data_file("tdf133160.ods")) as 
doc:
+with self.ui_test.load_file(get_url_for_data_file("tdf133160.ods")):
 
 xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
 xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": 
"", "COL": "1", "ROW": "3"}))
@@ -192,7 +192,7 @@ class AutofilterTest(UITestCase):
 
 
 def test_tdf89244(self):
-with self.ui_test.create_doc_in_start_center("calc") as document:
+with self.ui_test.create_doc_in_start_center("calc"):
 xCalcDoc = self.xUITest.getTopFocusWindow()
 gridwin = xCalcDoc.getChild("grid_window")
 
@@ -221,7 +221,7 @@ class AutofilterTest(UITestCase):
 
 
 def test_tdf116818(self):
-with self.ui_test.load_file(get_url_for_data_file("tdf116818.xlsx")) 
as doc:
+with self.ui_test.load_file(get_url_for_data_file("tdf116818.xlsx")):
 
 xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
 
@@ -250,7 +250,7 @@ class AutofilterTest(UITestCase):
 xOkBtn.executeAction("CLICK", tuple())
 
 def test_tdf140469(self):
-with self.ui_test.load_file(get_url_for_data_file("tdf140469.xlsx")) 
as doc:
+with self.ui_test.load_file(get_url_for_data_file("tdf140469.xlsx")):
 
 xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
 
@@ -263,7 +263,7 @@ class AutofilterTest(UITestCase):
 xOkBtn.executeAction("CLICK", tuple())
 
 def test_tdf140462(self):
-with self.ui_test.load_file(get_url_for_data_file("tdf140462.ods")) as 
doc:
+with self.ui_test.load_file(get_url_for_data_file("tdf140462.ods")):
 
 xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
 
@@ -292,7 +292,7 @@ class AutofilterTest(UITestCase):
 xOkBtn.executeAction("CLICK", tuple())
 
 def test_

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

[tagezi (via logerrit)]

 sc/qa/uitest/calc_tests8/tdf119343.py|2 +-
 sc/qa/uitest/calc_tests8/tdf124829.py|   10 ++
 sc/qa/uitest/calc_tests9/tdf142763.py|2 +-
 sc/qa/uitest/chart/chartGrids.py |2 +-
 sc/qa/uitest/chart/chartXAxis.py |2 +-
 sc/qa/uitest/chart/chartYAxis.py |3 +--
 sc/qa/uitest/chart/copyPaste.py  |5 +++--
 sc/qa/uitest/chart/tdf93506_trendline.py |3 +--
 sc/qa/uitest/conditional_format/tdf105351.py |   10 +-
 sc/qa/uitest/conditional_format/tdf81696.py  |2 +-
 sc/qa/uitest/sort/stableSorting.py   |2 +-
 sc/qa/uitest/statistics/fTest.py |6 ++
 sc/qa/uitest/statistics/tdf76731.py  |2 +-
 13 files changed, 21 insertions(+), 30 deletions(-)

New commits:
commit bd6cb0d8219b117b1a72774c26d54774c72602da
Author: tagezi 
AuthorDate: Fri May 27 11:04:25 2022 +0300
Commit: Xisco Fauli 
CommitDate: Fri May 27 11:59:12 2022 +0200

tdf#132293: Removing unused imports from uitests files.

This is the final cleanup of imports in the sc module.
'pyflakes sc' is now empty.
It seems, the most imports were copy-pasted from a file to a new one.
Additionally, the import block and surrounding area made more readable.

Change-Id: I8c4dff1007b9954c35795a7c8a940e8fcf8d7f93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135036
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests8/tdf119343.py 
b/sc/qa/uitest/calc_tests8/tdf119343.py
index 0debe6aea848..0d4581f18b11 100644
--- a/sc/qa/uitest/calc_tests8/tdf119343.py
+++ b/sc/qa/uitest/calc_tests8/tdf119343.py
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from uitest.uihelper.common import get_url_for_data_file
 
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
diff --git a/sc/qa/uitest/calc_tests8/tdf124829.py 
b/sc/qa/uitest/calc_tests8/tdf124829.py
index ef2a0213f93b..43e90d1f818c 100644
--- a/sc/qa/uitest/calc_tests8/tdf124829.py
+++ b/sc/qa/uitest/calc_tests8/tdf124829.py
@@ -7,16 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
-from uitest.uihelper.common import select_pos
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_sheet_from_doc
-from libreoffice.calc.conditional_format import 
get_conditional_format_from_sheet
-from libreoffice.calc.document import get_cell_by_position
-from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_url_for_data_file
 
-#Bug 124829 - CRASH: cutting and undoing a sheet with external links
 
+# Bug 124829 - CRASH: cutting and undoing a sheet with external links
 class tdf124829(UITestCase):
 def test_tdf124829_Crash_cutting_undo_sheet_external_links(self):
 #numberingformatpage.ui
diff --git a/sc/qa/uitest/calc_tests9/tdf142763.py 
b/sc/qa/uitest/calc_tests9/tdf142763.py
index 238d30833eb1..548be27b4148 100644
--- a/sc/qa/uitest/calc_tests9/tdf142763.py
+++ b/sc/qa/uitest/calc_tests9/tdf142763.py
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, 
select_pos
+from uitest.uihelper.common import get_state_as_dict, select_pos
 
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
diff --git a/sc/qa/uitest/chart/chartGrids.py b/sc/qa/uitest/chart/chartGrids.py
index dda37675c4cc..ba25f1662d26 100644
--- a/sc/qa/uitest/chart/chartGrids.py
+++ b/sc/qa/uitest/chart/chartGrids.py
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, 
type_text
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
 
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
diff --git a/sc/qa/uitest/chart/chartXAxis.py b/sc/qa/uitest/chart/chartXAxis.py
index 61fb5c11b78b..eafb350862f7 100644
--- a/sc/qa/uitest/chart/chartXAxis.py
+++ b/sc/qa/uitest/chart/chartXAxis.py
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import change_measurement_unit, type_text
+from uitest.uihelper.common import change_measurement_unit
 from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
 from uitest.uihelper.common import select_by_text, select_pos
 
diff --git a/sc/qa/uitest/chart/chartYAxis.py b/sc/qa/uitest/chart/chartYAxis.py
index

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

[tagezi (via logerrit)]

 sc/qa/uitest/calc_tests3/tdf139974.py |3 ++-
 sc/qa/uitest/calc_tests4/exportToPDF.py   |8 +---
 sc/qa/uitest/calc_tests4/saveToCSV.py |9 +
 sc/qa/uitest/calc_tests8/tdf125051.py |5 ++---
 sc/qa/uitest/calc_tests9/tdf126673.py |8 +++-
 sc/qa/uitest/calc_tests9/tdf141244.py |4 ++--
 sc/qa/uitest/calc_tests9/tdf144996.py |3 ++-
 sc/qa/uitest/chart/chartArea.py   |   10 --
 sc/qa/uitest/chart/chartAxes.py   |8 +++-
 sc/qa/uitest/chart/chartDataLabels.py |   10 --
 sc/qa/uitest/chart/chartGrid.py   |   11 ---
 sc/qa/uitest/chart/chartLegend.py |8 +++-
 sc/qa/uitest/chart/chartWall.py   |   10 --
 sc/qa/uitest/chart/formatDataSeries.py|   10 --
 sc/qa/uitest/chart/tdf122011.py   |5 +++--
 sc/qa/uitest/chart/tdf46885.py|5 ++---
 sc/qa/uitest/chart/tdf62349.py|7 +++
 sc/qa/uitest/chart/tdf99069.py|6 +++---
 sc/qa/uitest/chart2/tdf101894.py  |6 +++---
 sc/qa/uitest/chart2/tdf120348.py  |5 +++--
 sc/qa/uitest/chart2/tdf122398.py  |7 +++
 sc/qa/uitest/chart2/tdf123013.py  |7 +++
 sc/qa/uitest/chart2/tdf123231.py  |7 +++
 sc/qa/uitest/chart2/tdf123520.py  |   10 --
 sc/qa/uitest/chart2/tdf124111.py  |7 +++
 sc/qa/uitest/chart2/tdf136011.py  |6 +++---
 sc/qa/uitest/conditional_format/tdf117899.py  |   10 ++
 sc/qa/uitest/conditional_format/tdf118206.py  |8 
 sc/qa/uitest/csv_dialog/tdf39716.py   |3 ++-
 sc/qa/uitest/external_links/tdf114995.py  |6 +++---
 sc/qa/uitest/external_links/tdf127484.py  |8 
 sc/qa/uitest/external_links/tdf147767.py  |8 
 sc/qa/uitest/external_links/tdf95217.py   |8 
 sc/qa/uitest/external_links/tdf96499.py   |8 
 sc/qa/uitest/function_wizard/function_wizard.py   |3 +--
 sc/qa/uitest/goalSeek/goalSeek.py |6 +++---
 sc/qa/uitest/goalSeek/tdf37341.py |7 +++
 sc/qa/uitest/goalSeek/tdf43693.py |7 +++
 sc/qa/uitest/key_f4/tdf102525.py  |5 +++--
 sc/qa/uitest/options/tdf122977.py |6 +-
 sc/qa/uitest/pageFormat/tdf123508.py  |   11 ---
 sc/qa/uitest/range_name/tdf119954.py  |8 
 sc/qa/uitest/range_name/tdf86214.py   |3 +--
 sc/qa/uitest/search_replace/tdf35020.py   |6 +++---
 sc/qa/uitest/search_replace/tdf39917.py   |8 +++-
 sc/qa/uitest/search_replace/tdf39959.py   |7 +++
 sc/qa/uitest/search_replace/tdf44398.py   |7 +++
 sc/qa/uitest/search_replace/tdf44861.py   |7 +++
 sc/qa/uitest/signatureLine/insertSignatureLine.py |5 ++---
 sc/qa/uitest/solver/solver.py |4 ++--
 sc/qa/uitest/sort/subtotals.py|   10 +-
 sc/qa/uitest/sort/tdf49531.py |9 -
 sc/qa/uitest/sort/tdf54018.py |   10 --
 sc/qa/uitest/sort/tdf95192.py |8 
 sc/qa/uitest/sort/tdf99208.py |7 +++
 sc/qa/uitest/sort/tdf99627.py |7 +++
 sc/qa/uitest/statistics/regression.py |5 ++---
 sc/qa/uitest/textCase/textCase.py |4 ++--
 sc/qa/uitest/validity/tdf138134.py|7 +++
 sc/qa/uitest/validity/tdf53920.py |9 +
 sc/qa/uitest/validity/tdf65686.py |   10 +-
 sc/qa/uitest/validity/tdf96698.py |   10 +-
 sc/qa/uitest/validity/validity.py |7 +++
 63 files changed, 204 insertions(+), 243 deletions(-)

New commits:
commit 69a103b57a39798473ebc48fdad0f696cbd606a6
Author: tagezi 
AuthorDate: Mon May 16 23:16:29 2022 +0300
Commit: Xisco Fauli 
CommitDate: Mon May 23 14:35:38 2022 +0200

tdf#132293: Removing unused imports from uitests files.

It seems, the most imports were copy-pasted from a file to a new one.
Additionally, the import block and surrounding area made more readable.

Change-Id: Ie1f31c489cb1e744b5d01d35e3908f1071313e90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134413
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests3/tdf139974.py 
b/sc/qa/uitest/calc_tests3/tdf139974.py
index 1e7009b36fce..c30a05f90c19 100644
--- a/sc/qa/uitest/calc_tests3/tdf139974.py
+++ b/sc/qa

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

[tagezi (via logerrit)]

 sc/qa/uitest/calc_tests8/tdf119343.py|7 ++-
 sc/qa/uitest/calc_tests9/tdf142763.py|4 ++--
 sc/qa/uitest/chart/chartGrids.py |8 +++-
 sc/qa/uitest/chart/chartXAxis.py |   12 +---
 sc/qa/uitest/chart/chartYAxis.py |   12 +---
 sc/qa/uitest/chart/tdf93506_trendline.py |   14 ++
 sc/qa/uitest/chart2/tdf124295.py |2 --
 sc/qa/uitest/conditional_format/tdf105466.py |2 +-
 sc/qa/uitest/conditional_format/tdf105544.py |6 +++---
 sc/qa/uitest/conditional_format/tdf81696.py  |9 +++--
 sc/qa/uitest/function_wizard/tdf123479.py|8 ++--
 sc/qa/uitest/hide_cols/tdf95306.py   |5 ++---
 sc/qa/uitest/inputLine/tdf54197.py   |9 -
 sc/qa/uitest/key_f4/f4.py|6 +++---
 sc/qa/uitest/pasteSpecial/tdf74577.py|3 ++-
 sc/qa/uitest/protect/protectSheet.py |7 +++
 sc/qa/uitest/protect/protectSpreadsheet.py   |9 ++---
 sc/qa/uitest/sort/naturalSort.py |9 -
 sc/qa/uitest/sort/sorting.py |9 -
 sc/qa/uitest/sort/stableSorting.py   |7 ++-
 sc/qa/uitest/sort/tdf91305.py|8 
 sc/qa/uitest/sort/tdf99773.py|9 -
 sc/qa/uitest/statistics/anova.py |6 ++
 sc/qa/uitest/statistics/chiSquare.py |6 ++
 sc/qa/uitest/statistics/correlation.py   |6 ++
 sc/qa/uitest/statistics/covariance.py|6 ++
 sc/qa/uitest/statistics/descriptiveStatistics.py |6 ++
 sc/qa/uitest/statistics/exponentialSmoothing.py  |6 ++
 sc/qa/uitest/statistics/movingAverage.py |6 ++
 sc/qa/uitest/statistics/sampling.py  |7 +++
 sc/qa/uitest/statistics/tTest.py |6 ++
 sc/qa/uitest/statistics/tdf76731.py  |7 ++-
 sc/qa/uitest/statistics/zTest.py |6 ++
 33 files changed, 89 insertions(+), 144 deletions(-)

New commits:
commit 30a048cb895a3dcdd6048f3c525edd95a1371b91
Author: tagezi 
AuthorDate: Mon May 16 14:55:48 2022 +0300
Commit: Xisco Fauli 
CommitDate: Mon May 23 14:33:38 2022 +0200

tdf#132293: Removing unused imports from uitests files.

It seems, most of the most imports were copy-pasted from one file
to a new one.
Additionally, the import block and surrounding area made more readable.

Change-Id: I8afc5debef6e758d7ad42b1a649f9556d3d7abbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134400
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests8/tdf119343.py 
b/sc/qa/uitest/calc_tests8/tdf119343.py
index 51d35a99af93..0debe6aea848 100644
--- a/sc/qa/uitest/calc_tests8/tdf119343.py
+++ b/sc/qa/uitest/calc_tests8/tdf119343.py
@@ -8,15 +8,12 @@
 #
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
-from uitest.uihelper.common import select_pos
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_sheet_from_doc
-from libreoffice.calc.conditional_format import 
get_conditional_format_from_sheet
+
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 
-#Bug 119343 - EDITING: copied and pasted cells containing formulas are not 
recalculated (2)
 
+# Bug 119343 - EDITING: copied and pasted cells containing formulas are not 
recalculated (2)
 class tdf119343(UITestCase):
 def test_tdf119343_copy_paste_formula(self):
 #numberingformatpage.ui
diff --git a/sc/qa/uitest/calc_tests9/tdf142763.py 
b/sc/qa/uitest/calc_tests9/tdf142763.py
index e7885063a292..238d30833eb1 100644
--- a/sc/qa/uitest/calc_tests9/tdf142763.py
+++ b/sc/qa/uitest/calc_tests9/tdf142763.py
@@ -8,9 +8,9 @@
 #
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file, 
select_pos
+
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from libreoffice.calc.document import get_cell_by_position
-import time
+
 
 class Tdf142763(UITestCase):
 
diff --git a/sc/qa/uitest/chart/chartGrids.py b/sc/qa/uitest/chart/chartGrids.py
index 8bff4e58296c..dda37675c4cc 100644
--- a/sc/qa/uitest/chart/chartGrids.py
+++ b/sc/qa/uitest/chart/chartGrids.py
@@ -7,14 +7,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import select_pos
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.calc.document import get_cell_by_position
-from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file

[Libreoffice-commits] core.git: basctl/sdi basctl/source include/sfx2 officecfg/registry sfx2/sdi

[tagezi]

 basctl/sdi/baside.sdi |   27 +-
 basctl/source/basicide/basides1.cxx   |  125 
+++---
 basctl/source/basicide/iderdll.cxx|6 
 basctl/source/basicide/iderdll2.hxx   |5 
 basctl/source/inc/basidesh.hxx|   32 +-
 include/sfx2/sfxsids.hrc  |1 
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |5 
 sfx2/sdi/sfx.sdi  |   18 +
 8 files changed, 154 insertions(+), 65 deletions(-)

New commits:
commit 3322661414a558d29146c40c0cd5e9db0a7b21dd
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed Mar 28 21:25:33 2018 +0300

tdf#94498 add repeat search in Basic IDE by shortcut

additionally deduplicate code and remove unnecessary abstraction

Change-Id: Ib826b5cac74e95ce4ae8d02368b0983eb4942b29
Reviewed-on: https://gerrit.libreoffice.org/52027
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 180cdf2caa6a..5c413f89e6c4 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -99,30 +99,45 @@ shell basctl_Shell
 StateMethod = GetState;
 ]
 
-SID_SEARCH_OPTIONS
+SID_GOTOLINE
 [
 ExecMethod  = ExecuteCurrent;
 StateMethod = GetState;
 ]
 
-SID_SEARCH_ITEM
+
+// Search in IDE Basic
+
+SID_SEARCH_OPTIONS
 [
-ExecMethod  = ExecuteCurrent;
+ExecMethod  = ExecuteSearch;
 StateMethod = GetState;
 ]
 
-SID_GOTOLINE
+SID_SEARCH_ITEM
 [
-ExecMethod  = ExecuteCurrent;
+ExecMethod  = ExecuteSearch;
 StateMethod = GetState;
 ]
 
 FID_SEARCH_NOW
 [
-ExecMethod  = ExecuteCurrent;
+ExecMethod  = ExecuteSearch;
 StateMethod = GetState;
 ]
 
+SID_BASICIDE_REPEAT_SEARCH
+[
+ExecMethod  = ExecuteSearch;
+StateMethod = GetState;
+]
+
+FID_SEARCH_ON // status()
+[
+ExecMethod = ExecuteSearch;
+Export = FALSE;
+]
+
 FID_SEARCH_OFF
 [
 ExecMethod  = ExecuteCurrent;
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 95025f859bf9..da1c86f1872d 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -58,40 +57,56 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 
-void Shell::ExecuteCurrent( SfxRequest& rReq )
+void Shell::ExecuteSearch( SfxRequest& rReq )
 {
 if ( !pCurWin )
 return;
 
-switch ( rReq.GetSlot() )
+const SfxItemSet* pArgs = rReq.GetArgs();
+sal_uInt16 nSlot = rReq.GetSlot();
+
+// if searching has not been done before this time
+if (nSlot == SID_BASICIDE_REPEAT_SEARCH && !mpSearchItem)
 {
-case SID_BASICIDE_HIDECURPAGE:
-{
-pCurWin->StoreData();
-RemoveWindow( pCurWin, false );
-}
-break;
-case SID_BASICIDE_RENAMECURRENT:
-{
-pTabBar->StartEditMode( pTabBar->GetCurPageId() );
-}
-break;
+rReq.SetReturnValue(SfxBoolItem(nSlot, false));
+nSlot = 0;
+}
+
+switch ( nSlot )
+{
+case SID_SEARCH_OPTIONS:
+break;
+case SID_SEARCH_ITEM:
+mpSearchItem.reset( static_cast<SvxSearchItem*>( 
pArgs->Get(SID_SEARCH_ITEM).Clone() ));
+break;
+case FID_SEARCH_ON:
+mbJustOpened = true;
+GetViewFrame()->GetBindings().Invalidate(SID_SEARCH_ITEM);
+break;
+case SID_BASICIDE_REPEAT_SEARCH:
 case FID_SEARCH_NOW:
 {
 if (!pCurWin->HasActiveEditor())
 break;
-DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
-SfxItemSet const& rArgs = *rReq.GetArgs();
-// unfortunately I don't know the ID:
-sal_uInt16 nWhich = rArgs.GetWhichByPos( 0 );
-DBG_ASSERT( nWhich, "Which for SearchItem?" );
-SfxPoolItem const& rItem = rArgs.Get(nWhich);
-DBG_ASSERT(dynamic_cast(), "no 
searchitem!");
-SvxSearchItem const& rSearchItem = static_cast(rItem);
-// memorize item because of the adjustments...
-GetExtraData()->SetSearchItem(rSearchItem);
+
+// If it is a repeat searching
+if ( nSlot == SID_BASICIDE_REP

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

[tagezi]

 sc/inc/table.hxx   |2 +
 sc/source/core/data/table1.cxx |   73 ++---
 2 files changed, 57 insertions(+), 18 deletions(-)

New commits:
commit 3b3e203461441da733096be323641a8dc07ff24f
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Feb 1 13:52:49 2018 +0300

tdf#68290 cursor moves with Enter in protected sheet

Change-Id: I2ac848f1799d94f521628480664cdb579417772a
Reviewed-on: https://gerrit.libreoffice.org/49085
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b4634806069b..08ddea363fbf 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -593,6 +593,8 @@ public:
 voidGetNextPos( SCCOL& rCol, SCROW& rRow, SCCOL nMovX, SCROW nMovY,
 bool bMarked, bool bUnprotected, const 
ScMarkData& rMark ) const;
 
+boolSkipRow( const SCCOL rCol, SCROW& rRow, const SCROW nMovY, 
const ScMarkData& rMark,
+ const bool bUp, const SCROW nUsedY, const bool 
bSheetProtected ) const;
 voidLimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& 
rEndCol, SCROW& rEndRow ) const;
 
 boolHasData( SCCOL nCol, SCROW nRow ) const;
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index ddc440d55fa0..5a0d97d83b60 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1318,10 +1318,47 @@ bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, 
const ScMarkData& rMark,
 return true;
 }
 
+// Skips the current cell if it is Hidden, Overlapped or Protected and Sheet 
is Protected
+bool ScTable::SkipRow( const SCCOL nCol, SCROW& rRow, const SCROW nMovY,
+const ScMarkData& rMark, const bool bUp, const SCROW nUsedY, const 
bool bSheetProtected ) const
+{
+if ( !ValidRow( rRow ))
+return false;
+
+if (bSheetProtected && pDocument->HasAttrib( nCol, rRow, nTab, nCol, rRow, 
nTab, HasAttrFlags::Protected))
+{
+if ( rRow > nUsedY )
+rRow = (bUp ? nUsedY : MAXROW + nMovY);
+else
+rRow += nMovY;
+
+rRow  = rMark.GetNextMarked( nCol, rRow, bUp );
+
+return true;
+}
+else
+{
+bool bRowHidden  = RowHidden( rRow );
+bool bOverlapped = pDocument->HasAttrib( nCol, rRow, nTab, nCol, rRow, 
nTab, HasAttrFlags::Overlapped );
+
+if ( bRowHidden || bOverlapped )
+{
+rRow += nMovY;
+rRow  = rMark.GetNextMarked( nCol, rRow, bUp );
+
+return true;
+}
+}
+
+return false;
+}
+
 void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCCOL nMovX, SCROW nMovY,
 bool bMarked, bool bUnprotected, const 
ScMarkData& rMark ) const
 {
-if (bUnprotected && !IsProtected()) // Is sheet really protected?
+bool bSheetProtected = IsProtected();
+
+if ( bUnprotected && !bSheetProtected ) // Is sheet really protected?
 bUnprotected = false;
 
 sal_uInt16 nWrap = 0;
@@ -1336,30 +1373,33 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, 
SCCOL nMovX, SCROW nMovY,
 
 if ( nMovY && bMarked )
 {
-bool bUp = ( nMovY < 0 );
+bool  bUp= ( nMovY < 0 );
+SCROW nUsedY = nRow;
+SCCOL nUsedX = nCol;
+
 nRow = rMark.GetNextMarked( nCol, nRow, bUp );
-while ( ValidRow(nRow) &&
-(RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, 
nCol, nRow, nTab, HasAttrFlags::Overlapped)) )
-{
-//  skip hidden rows (see above)
-nRow += nMovY;
-nRow = rMark.GetNextMarked( nCol, nRow, bUp );
-}
+pDocument->GetPrintArea( nTab, nUsedX, nUsedY );
+
+while ( SkipRow( nCol, nRow, nMovY, rMark, bUp, nUsedY, 
bSheetProtected ))
+;
 
 while ( nRow < 0 || nRow > MAXROW )
 {
 nCol = sal::static_int_cast( nCol + 
static_cast(nMovY) );
+
 while ( ValidCol(nCol) && ColHidden(nCol) )
 nCol = sal::static_int_cast( nCol + 
static_cast(nMovY) );   //  skip hidden rows (see above)
 if (nCol < 0)
 {
-nCol = MAXCOL;
+nCol = (bSheetProtected ? nUsedX : MAXCOL);
+
 if (++nWrap >= 2)
 return;
 }
-else if (nCol > MAXCOL)
+else if (nCol > MAXCOL || ( nCol > nUsedX && bSheetProtected ))
 {
 nCol = 0;
+
 if (++nWrap >= 2)
 return;
 }
@@ -1367,14 +1407,11 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, 
SCCOL nMovX, SCROW nMov

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01d64f4bee56f3db2348f29a24c9cd7325bb4ce2
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sat Feb 17 17:47:10 2018 +0300

Updated core
Project: help  75cf318614f73c93a51538a9508ccca2b47f82b1

Deletion [Runtime] from names functions

[Runtime] was deleted
[Runtime - VBA] was replaced to [VBA]
Combination of words "runtime functions" and "runtime categiries"
was replaced to "functions" and "categiries" respectively

Change-Id: I1f03a5f2ef1697e216e144ecccbfb8942b315718
Reviewed-on: https://gerrit.libreoffice.org/49914
Tested-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Reviewed-by: Sophie Gautier <gautier.sop...@gmail.com>
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/helpcontent2 b/helpcontent2
index 5339d3c91fb8..75cf318614f7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5339d3c91fb81ea593a96c5602b767d68aba623f
+Subproject commit 75cf318614f73c93a51538a9508ccca2b47f82b1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 sc/source/ui/view/tabview3.cxx |   31 +++
 1 file changed, 15 insertions(+), 16 deletions(-)

New commits:
commit b0a391d62c1df7525069a02913a52af940d92ecc
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Jan 26 16:26:53 2018 +0300

Circular movement of cursor in a table with  hidden columns/rows, tdf#68290 
related

If there is a table with range on the edges of the hidden columns/rows,
it allows you to quickly jump to the beginning/end of a neighboring
column using Enter/Shift+Enter

Change-Id: I5b18789b70089a6987ec7718998f5861261b22f8
Reviewed-on: https://gerrit.libreoffice.org/48691
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 13e2ac264bea..f8a5a7b4da53 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1369,21 +1369,21 @@ void ScTabView::MoveCursorEnter( bool bShift )  
// bShift -> up/down
 break;
 }
 
+SCCOL nCurX;
+SCROW nCurY;
+aViewData.GetMoveCursor( nCurX,nCurY );
+SCCOL nNewX = nCurX;
+SCROW nNewY = nCurY;
+SCTAB nTab  = aViewData.GetTabNo();
+
 ScMarkData& rMark = aViewData.GetMarkData();
+ScDocument* pDoc  = aViewData.GetDocument();
+
 if (rMark.IsMarked() || rMark.IsMultiMarked())
 {
-SCCOL nCurX;
-SCROW nCurY;
-aViewData.GetMoveCursor( nCurX,nCurY );
-SCCOL nNewX = nCurX;
-SCROW nNewY = nCurY;
-SCTAB nTab = aViewData.GetTabNo();
+pDoc->GetNextPos( nNewX, nNewY, nTab, nMoveX, nMoveY, true, false, 
rMark );
 
-ScDocument* pDoc = aViewData.GetDocument();
-pDoc->GetNextPos( nNewX,nNewY, nTab, nMoveX,nMoveY, true, false, rMark 
);
-
-MoveCursorRel( nNewX-nCurX, nNewY-nCurY,
-SC_FOLLOW_LINE, false, true );
+MoveCursorRel( nNewX - nCurX, nNewY - nCurY, SC_FOLLOW_LINE, false, 
true );
 
 //  update input line even if cursor was not moved
 if ( nNewX == nCurX && nNewY == nCurY )
@@ -1393,18 +1393,17 @@ void ScTabView::MoveCursorEnter( bool bShift )  
// bShift -> up/down
 {
 if ( nMoveY != 0 && !nMoveX )
 {
+pDoc->GetNextPos( nNewX, nNewY, nTab, nMoveX, nMoveY, true, false, 
rMark );
+
 // after Tab and Enter back to the starting column again
 SCCOL nTabCol = aViewData.GetTabStartCol();
 if (nTabCol != SC_TABSTART_NONE)
 {
-SCCOL nCurX;
-SCROW nCurY;
-aViewData.GetMoveCursor( nCurX,nCurY );
-nMoveX = nTabCol-nCurX;
+nNewX = nTabCol;
 }
 }
 
-MoveCursorRel( nMoveX,nMoveY, SC_FOLLOW_LINE, false );
+MoveCursorRel( nNewX - nCurX, nNewY - nCurY, SC_FOLLOW_LINE, false, 
true );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 cui/source/dialogs/hlmarkwn.cxx |  102 +++-
 1 file changed, 20 insertions(+), 82 deletions(-)

New commits:
commit 42bfd68be7525b2ac4d7c4cab5393d7a4a8e4242
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Dec 28 11:32:51 2017 +0300

Removed valueless lines of comments

Additionally, some lines are converted to a format of 110 characters

Change-Id: I7c3fe97f7ebb2530eeb62d0522cd8a8b1c7269e1
Reviewed-on: https://gerrit.libreoffice.org/47121
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 811c987d4758..cfcda09e2a2c 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -45,12 +45,7 @@
 
 using namespace ::com::sun::star;
 
-/*
-|*
-|* Userdata-struct for tree-entries
-|*
-|/
-
+// Userdata-struct for tree-entries
 struct TargetData
 {
 OUString aUStrLinkname;
@@ -64,9 +59,7 @@ struct TargetData
 }
 };
 
-//#  #
-//# Tree-Window  #
-//#  #
+// Tree-Window
 SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle)
 : SvTreeListBox(pParent, nStyle)
 , mpParentWnd(nullptr)
@@ -116,21 +109,14 @@ void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& 
rRenderContext, const ::tools:
 break;
 }
 
-rRenderContext.DrawText(aDrawRect, aStrMessage, DrawTextFlags::Left | 
DrawTextFlags::MultiLine | DrawTextFlags::WordBreak);
+rRenderContext.DrawText(aDrawRect, aStrMessage, DrawTextFlags::Left
+| DrawTextFlags::MultiLine | DrawTextFlags::WordBreak);
 }
 }
 
 
-//#  #
-//# Window-Class #
-//#  #
-
-
-/*
-|*
-|* Constructor / Destructor
-|*
-|/
+//*** Window-Class ***
+// Constructor / Destructor
 SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
 : ModalDialog(pParent, "HyperlinkMark", "cui/ui/hyperlinkmarkdialog.ui")
 , mbUserMoved(false)
@@ -167,11 +153,7 @@ void SvxHlinkDlgMarkWnd::dispose()
 ModalDialog::dispose();
 }
 
-/*
-|*
-|* Set an errorstatus
-|*
-|/
+// Set an errorstatus
 sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError)
 {
 sal_uInt16 nOldError = mnError;
@@ -185,12 +167,7 @@ sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError)
 return nOldError;
 }
 
-/*
-|*
-|* Move window
-|*
-|/
-
+// Move window
 bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos )
 {
 if ( !mbUserMoved )
@@ -268,9 +245,8 @@ void SvxHlinkDlgMarkWnd::RestoreLastSelection()
 aViewSettings.GetUserItem(TG_SETTING_LASTPATH) >>= aTmp;
 aLastSelectedPath = comphelper::sequenceToContainer< 
std::deque >(aTmp);
 }
-//fallback to previous entry selected the last
-//time we executed this dialog. First see if
-//the exact mark exists and re-use that
+//fallback to previous entry selected the last time we executed this 
dialog.
+//First see if the exact mark exists and re-use that
 if (!sLastSelectedMark.isEmpty())
 bSelectedEntry = SelectEntry(sLastSelectedMark);
 //Otherwise just select the closest path available
@@ -282,12 +258,7 @@ void SvxHlinkDlgMarkWnd::RestoreLastSelection()
 }
 }
 
-/*
-|*
-|* Interface to refresh tree
-|*
-|/
-
+// Interface to refresh tree
 void SvxHlinkDlgMarkWnd::RefreshTree (const OUString& aStrURL)
 {
 OUString aUStrURL;
@@ -320,12 +291,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree (const OUString& 
aStrURL)
 maStrLastURL = aStrURL;
 }
 
-/*
-|*
-|* get links from document
-|*
-|/
-
+// get links from document
 bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL)
 {
 mn

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

[tagezi]

 include/svtools/strings.hrc|1 +
 svtools/source/java/javainteractionhandler.cxx |   10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 506e1396c34bb90c8d2c3679e3e84c3833b18869
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sun Jan 21 19:08:30 2018 +0300

tdf#115002 Including of bitness information into Java message on Windows

Change-Id: Id5235360110cf9838a38f8063448b06a5de1f82c
Reviewed-on: https://gerrit.libreoffice.org/48272
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index e9e05f2f8109..5413f7794daa 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -282,6 +282,7 @@
 #define STR_SVT_DEFAULT_SERVICE_LABEL   
NC_("STR_SVT_DEFAULT_SERVICE_LABEL", "$user$'s $service$")
 
 #define STR_WARNING_JAVANOTFOUND
NC_("STR_WARNING_JAVANOTFOUND", "%PRODUCTNAME requires a Java runtime 
environment (JRE) to perform this task. Please install a JRE and restart 
%PRODUCTNAME.")
+#define STR_WARNING_JAVANOTFOUND_WIN
NC_("STR_WARNING_JAVANOTFOUND_WIN", "%PRODUCTNAME requires a %BITNESS-bit Java 
runtime environment (JRE) to perform this task. Please install a JRE and 
restart %PRODUCTNAME.")
 #define STR_WARNING_JAVANOTFOUND_MAC
NC_("STR_WARNING_JAVANOTFOUND_MAC", "%PRODUCTNAME requires Oracle's Java 
Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please 
install them and restart %PRODUCTNAME.")
 #define STR_WARNING_INVALIDJAVASETTINGS_MAC 
NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has 
been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, 
select the Java runtime environment you want to have used by %PRODUCTNAME.")
 #define STR_WARNING_INVALIDJAVASETTINGS 
NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been 
changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java 
runtime environment you want to have used by %PRODUCTNAME.")
diff --git a/svtools/source/java/javainteractionhandler.cxx 
b/svtools/source/java/javainteractionhandler.cxx
index ba9625065663..6eb906a23005 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -118,8 +118,16 @@ void SAL_CALL JavaInteractionHandler::handle( const 
Reference< XInteractionReque
// No suitable JRE found
 SolarMutexGuard aSolarGuard;
 m_bJavaNotFound_Handled = true;
-#ifdef MACOSX
+#if defined( MACOSX )
 ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, 
SvtResId(STR_WARNING_JAVANOTFOUND_MAC), VclMessageType::Warning);
+#elif defined( _WIN32 )
+ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, 
SvtResId(STR_WARNING_JAVANOTFOUND_WIN), VclMessageType::Warning);
+OUString sPrimTex = aWarningBox->get_primary_text();
+#if defined( _WIN64 )
+aWarningBox->set_primary_text(sPrimTex.replaceAll( "%BITNESS", 
"64" ));
+#else
+aWarningBox->set_primary_text(sPrimTex.replaceAll( "%BITNESS", 
"32" ));
+#endif
 #else
 ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, 
SvtResId(STR_WARNING_JAVANOTFOUND), VclMessageType::Warning);
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 sc/source/ui/view/cellsh1.cxx |   51 ++
 1 file changed, 22 insertions(+), 29 deletions(-)

New commits:
commit 22dc2e5cd3e06e12f08dbb86df2df86860d301d6
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sat Dec 23 13:17:47 2017 +0200

tdf#39593 deduplicate code in ScCellShell

Change-Id: I764edf0c1fb093bf64ea3ea91f98f8586d9549f5
Reviewed-on: https://gerrit.libreoffice.org/47017
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 414f30bf9cac..4f075c981999 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -154,6 +154,26 @@ OUString FlagsToString( InsertDeleteFlags nFlags,
 }
 return aFlagsStr;
 }
+
+void SetTabNoAndCursor( const ScViewData* rViewData, const OUString& rCellId )
+{
+ScTabViewShell* pTabViewShell = rViewData->GetViewShell();
+assert(pTabViewShell);
+const ScDocument& rDoc = rViewData->GetDocShell()->GetDocument();
+std::vector aNotes;
+rDoc.GetAllNoteEntries(aNotes);
+
+sal_uInt32 nId = rCellId.toUInt32();
+auto lComp = [nId](const sc::NoteEntry& rNote) { return 
rNote.mpNote->GetId() == nId; };
+
+const auto& aFoundNoteIt = std::find_if(aNotes.begin(), aNotes.end(), 
lComp);
+if (aFoundNoteIt != aNotes.end())
+{
+ScAddress aFoundPos = aFoundNoteIt->maPos;
+pTabViewShell->SetTabNo(aFoundPos.Tab());
+pTabViewShell->SetCursor(aFoundPos.Col(), aFoundPos.Row());
+}
+}
 }
 
 void ScCellShell::ExecuteEdit( SfxRequest& rReq )
@@ -2190,21 +2210,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
 if (!aCellId.isEmpty())
 {
-
-ScDocument& rDoc = 
GetViewData()->GetDocShell()->GetDocument();
-std::vector aNotes;
-rDoc.GetAllNoteEntries(aNotes);
-
-sal_uInt32 nId = aCellId.toUInt32();
-auto lComp = [nId](const sc::NoteEntry& rNote) { 
return rNote.mpNote->GetId() == nId; };
-
-const auto& aFoundNoteIt = 
std::find_if(aNotes.begin(), aNotes.end(), lComp);
-if (aFoundNoteIt != aNotes.end())
-{
-ScAddress aFoundPos = aFoundNoteIt->maPos;
-pTabViewShell->SetTabNo(aFoundPos.Tab());
-pTabViewShell->SetCursor(aFoundPos.Col(), 
aFoundPos.Row());
-}
+SetTabNoAndCursor( GetViewData(), aCellId );
 }
 
 ScAddress aPos( GetViewData()->GetCurX(), 
GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
@@ -2385,20 +2391,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 OUString aCellId = pIdItem->GetValue();
 if (!aCellId.isEmpty())
 {
-ScDocument& rDoc = 
GetViewData()->GetDocShell()->GetDocument();
-std::vector aNotes;
-rDoc.GetAllNoteEntries(aNotes);
-
-sal_uInt32 nId = aCellId.toUInt32();
-auto lComp = [nId](const sc::NoteEntry& rNote) { return 
rNote.mpNote->GetId() == nId; };
-
-const auto& aFoundNoteIt = std::find_if(aNotes.begin(), 
aNotes.end(), lComp);
-if (aFoundNoteIt != aNotes.end())
-{
-ScAddress aFoundPos = aFoundNoteIt->maPos;
-pTabViewShell->SetTabNo(aFoundPos.Tab());
-pTabViewShell->SetCursor(aFoundPos.Col(), 
aFoundPos.Row());
-}
+SetTabNoAndCursor( GetViewData(), aCellId );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 sc/source/ui/view/cellsh1.cxx |   73 +++---
 1 file changed, 27 insertions(+), 46 deletions(-)

New commits:
commit e76bdaeb300e8420a8bc96e5e38b858821d22564
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sat Dec 23 00:17:22 2017 +0200

tdf#39593 deduplicate code in ScCellShell

Change-Id: Ia2a4219a9e21cdbaeaab99df52c79dfa1ce9e184
Reviewed-on: https://gerrit.libreoffice.org/47003
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 0ee77d29ba6c..7a7ecf3da833 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -130,6 +130,30 @@ InsertDeleteFlags FlagsFromString(const OUString& 
rFlagsStr,
 }
 return nFlags;
 }
+
+OUString FlagsToString( InsertDeleteFlags nFlags,
+InsertDeleteFlags nFlagsMask = InsertDeleteFlags::CONTENTS | 
InsertDeleteFlags::ATTRIB )
+{
+OUString  aFlagsStr;
+
+if( nFlags == InsertDeleteFlags::ALL )
+{
+aFlagsStr = "A";
+}
+else
+{
+nFlags &= nFlagsMask;
+
+if( nFlags & InsertDeleteFlags::STRING )aFlagsStr += "S";
+if( nFlags & InsertDeleteFlags::VALUE ) aFlagsStr += "V";
+if( nFlags & InsertDeleteFlags::DATETIME )  aFlagsStr += "D";
+if( nFlags & InsertDeleteFlags::FORMULA )   aFlagsStr += "F";
+if( nFlags & InsertDeleteFlags::NOTE )  aFlagsStr += "N";
+if( nFlags & InsertDeleteFlags::ATTRIB )aFlagsStr += "T";
+if( nFlags & InsertDeleteFlags::OBJECTS )   aFlagsStr += "O";
+}
+return aFlagsStr;
+}
 }
 
 void ScCellShell::ExecuteEdit( SfxRequest& rReq )
@@ -404,22 +428,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
 if( ! rReq.IsAPI() )
 {
-OUString  aFlags;
-
-if( nFlags == InsertDeleteFlags::ALL )
-{
-aFlags += "A";
-}
-else
-{
-if( nFlags & InsertDeleteFlags::STRING ) aFlags += 
"S";
-if( nFlags & InsertDeleteFlags::VALUE ) aFlags += 
"V";
-if( nFlags & InsertDeleteFlags::DATETIME ) aFlags 
+= "D";
-if( nFlags & InsertDeleteFlags::FORMULA ) aFlags 
+= "F";
-if( nFlags & InsertDeleteFlags::NOTE ) aFlags += 
"N";
-if( nFlags & InsertDeleteFlags::ATTRIB ) aFlags += 
"T";
-if( nFlags & InsertDeleteFlags::OBJECTS ) aFlags 
+= "O";
-}
+OUString aFlags = FlagsToString( nFlags, 
InsertDeleteFlags::ALL );
 
 rReq.AppendItem( SfxStringItem( SID_DELETE, aFlags ) );
 rReq.Done();
@@ -493,21 +502,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
 if( ! rReq.IsAPI() )
 {
-OUString  aFlags;
-
-if( nFlags == InsertDeleteFlags::ALL )
-{
-aFlags += "A";
-}
-else
-{
-if( nFlags & InsertDeleteFlags::STRING ) aFlags += 
"S";
-if( nFlags & InsertDeleteFlags::VALUE ) aFlags += 
"V";
-if( nFlags & InsertDeleteFlags::DATETIME ) aFlags 
+= "D";
-if( nFlags & InsertDeleteFlags::FORMULA ) aFlags 
+= "F";
-if( nFlags & InsertDeleteFlags::NOTE ) aFlags += 
"N";
-if( nFlags & InsertDeleteFlags::ATTRIB ) aFlags += 
"T";
-}
+OUString aFlags = FlagsToString( nFlags );
 
 rReq.AppendItem( SfxStringItem( FID_FILL_TAB, aFlags ) 
);
 rReq.Done();
@@ -1463,21 +1458,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
 if( !pReqArgs )
 {
-OUString  aFlags;
-
-if( nFlags == InsertDeleteFlags::ALL )
-{
-aFlags += "A";
-}
-else
-{
-if( nFlags & InsertDeleteFlags::

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

[tagezi]

 sc/source/ui/view/cellsh1.cxx |   86 +-
 1 file changed, 28 insertions(+), 58 deletions(-)

New commits:
commit a5fe3117e1877fa0bfb55f1cf22cf9394b3f0795
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Dec 22 01:05:13 2017 +0200

tdf#39593 deduplicate code in ScCellShell

Change-Id: I240715d73c5ae320a3dfab786b446e229083ff4b
Reviewed-on: https://gerrit.libreoffice.org/46941
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 8f0063986168..89bda8c80c2e 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -107,6 +107,31 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 
+namespace{
+InsertDeleteFlags FlagsFromString(const OUString& rFlagsStr,
+InsertDeleteFlags nFlagsMask = InsertDeleteFlags::CONTENTS | 
InsertDeleteFlags::ATTRIB)
+{
+OUString aFlagsStr = rFlagsStr.toAsciiUpperCase();
+InsertDeleteFlags nFlags = InsertDeleteFlags::NONE;
+
+for (sal_Int32 i=0 ; i < aFlagsStr.getLength(); ++i)
+{
+switch (aFlagsStr[i])
+{
+case 'A': returnInsertDeleteFlags::ALL;
+case 'S': nFlags |= InsertDeleteFlags::STRING   & nFlagsMask; 
break;
+case 'V': nFlags |= InsertDeleteFlags::VALUE& nFlagsMask; 
break;
+case 'D': nFlags |= InsertDeleteFlags::DATETIME & nFlagsMask; 
break;
+case 'F': nFlags |= InsertDeleteFlags::FORMULA  & nFlagsMask; 
break;
+case 'N': nFlags |= InsertDeleteFlags::NOTE & nFlagsMask; 
break;
+case 'T': nFlags |= InsertDeleteFlags::ATTRIB   & nFlagsMask; 
break;
+case 'O': nFlags |= InsertDeleteFlags::OBJECTS  & nFlagsMask; 
break;
+}
+}
+return nFlags;
+}
+}
+
 void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 {
 ScModule*   pScMod  = SC_MOD();
@@ -348,26 +373,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 if( pReqArgs->HasItem( SID_DELETE,  ) )
 aFlags = static_cast(pItem)->GetValue();
 
-aFlags = aFlags.toAsciiUpperCase();
-boolbCont = true;
-
-for (sal_Int32 i=0 ; bCont && i<aFlags.getLength(); ++i)
-{
-switch (aFlags[i])
-{
-case 'A': // all
-nFlags |= InsertDeleteFlags::ALL;
-bCont = false; // don't continue!
-break;
-case 'S': nFlags |= InsertDeleteFlags::STRING; 
break;
-case 'V': nFlags |= InsertDeleteFlags::VALUE; 
break;
-case 'D': nFlags |= InsertDeleteFlags::DATETIME; 
break;
-case 'F': nFlags |= InsertDeleteFlags::FORMULA; 
break;
-case 'N': nFlags |= InsertDeleteFlags::NOTE; break;
-case 'T': nFlags |= InsertDeleteFlags::ATTRIB; 
break;
-case 'O': nFlags |= InsertDeleteFlags::OBJECTS; 
break;
-}
-}
+nFlags |= FlagsFromString(aFlags, InsertDeleteFlags::ALL);
 }
 else
 {
@@ -459,25 +465,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 if( pReqArgs->HasItem( FID_FILL_TAB,  ) )
 aFlags = static_cast(pItem)->GetValue();
 
-aFlags = aFlags.toAsciiUpperCase();
-boolbCont = true;
-
-for (sal_Int32 i=0; bCont && i < aFlags.getLength(); ++i)
-{
-switch (aFlags[i])
-{
-case 'A': // all
-nFlags |= InsertDeleteFlags::ALL;
-bCont = false; // don't continue!
-break;
-case 'S': nFlags |= InsertDeleteFlags::STRING; 
break;
-case 'V': nFlags |= InsertDeleteFlags::VALUE; 
break;
-case 'D': nFlags |= InsertDeleteFlags::DATETIME; 
break;
-case 'F': nFlags |= InsertDeleteFlags::FORMULA; 
break;
-case 'N': nFlags |= InsertDeleteFlags::NOTE; break;
-case 'T': nFlags |= InsertDeleteFlags::ATTRIB; 
break;
-}
-}
+nFlags |= FlagsFromString(aFlags);
 }
 else
 {
@@ -1354,25 +1342,7 

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

[tagezi]

 sc/source/ui/condformat/condformatdlg.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6db8e752c6075d69d5ff475e15a12317ac9aa4e2
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed Dec 20 23:40:47 2017 +0200

tdf#114603 highlights of EditField if a range is not valid

Change-Id: Ie0576175aa51efe9a1dade1581af9898f66e92e5
Reviewed-on: https://gerrit.libreoffice.org/46866
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 4f9f82568d1a..caf22a5bcdd9 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -552,6 +552,10 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, 
SfxChildWindow* pCW,
 get(mpCondFormList, "list");
 mpCondFormList->init(mpViewData->GetDocument(), this, pFormat, aRange, 
maPos, mpDlgItem->GetDialogType());
 
+// tdf#114603: enable setting the background to a different color;
+// relevant for GTK; see also #i75179#
+mpEdRange->SetForceControlBackground(true);
+
 mpBtnOk->SetClickHdl(LINK(this, ScCondFormatDlg, BtnPressedHdl ) );
 mpBtnAdd->SetClickHdl( LINK( mpCondFormList, ScCondFormatList, AddBtnHdl ) 
);
 mpBtnRemove->SetClickHdl( LINK( mpCondFormList, ScCondFormatList, 
RemoveBtnHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig

[tagezi]

 sfx2/source/appl/sfxhelp.cxx   |9 -
 sfx2/uiconfig/ui/helpmanual.ui |2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 400b70f85fdf0ae5a6d606eb3fff683b9f1ce7ab
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue Dec 5 16:01:32 2017 +0200

tdf#114204 - Clarify the "Local Help not installed" message

Change-Id: If25e5f8a1eb2e247e2432bb8a14b7a4aa2509f62
Reviewed-on: https://gerrit.libreoffice.org/45880
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4d5a2b240a01..bce03be37adb 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -650,7 +651,13 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const 
vcl::Window* pWindow, const
 
 if ( !impl_hasHelpInstalled() )
 {
-ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< 
vcl::Window* >( pWindow ),"onlinehelpmanual","sfx/ui/helpmanual.ui");
+ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast< 
vcl::Window* >( pWindow ),
+"onlinehelpmanual", "sfx/ui/helpmanual.ui");
+
+LanguageTag aLangTag = Application::GetSettings().GetUILanguageTag();
+OUString sLocaleString = SvtLanguageTable::GetLanguageString( 
aLangTag.getLanguageType() );
+OUString sPrimTex = aQueryBox->get_primary_text();
+aQueryBox->set_primary_text(sPrimTex.replaceAll("$UILOCALE", 
sLocaleString));
 short OnlineHelpBox = aQueryBox->Execute();
 
 if(OnlineHelpBox == RET_OK)
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
index f3847c880a92..e750ed0c7a96 100644
--- a/sfx2/uiconfig/ui/helpmanual.ui
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -9,7 +9,7 @@
 False
 dialog
 True
-The %PRODUCTNAME built-in help is not 
installed on your computer.
+The %PRODUCTNAME built-in help for 
current UI language ($UILOCALE) is not installed on your computer.
 You may either install it from our 
website or your system’s repositories, or read an online version.
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[tagezi]

 sc/source/ui/condformat/condformatdlg.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit fe31edb29e5e77bb60e3aa73ec6a0380314acc61
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue Dec 19 13:32:26 2017 +0200

tdf#114545 Enabling/Disabling Ok button depending on correct format

Change-Id: Iab3c4363dda0260d16c7167946044c39c21b863a
Reviewed-on: https://gerrit.libreoffice.org/46790
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit 7504af39686171ffb16e70f798d9ecf4ea98f1d3)
Reviewed-on: https://gerrit.libreoffice.org/46823
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index b7b0c40a73d8..0409efd5dda6 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -772,9 +772,15 @@ IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit&, 
rEdit, void )
 ScRefFlags nFlags = aRange.Parse(aRangeStr, mpViewData->GetDocument(),
 mpViewData->GetDocument()->GetAddressConvention());
 if(nFlags & ScRefFlags::VALID)
+{
 
rEdit.SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor());
+mpBtnOk->Enable(true);
+}
 else
+{
 rEdit.SetControlBackground(COL_LIGHTRED);
+mpBtnOk->Enable(false);
+}
 
 updateTitle();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 sc/source/ui/condformat/condformatdlg.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 7504af39686171ffb16e70f798d9ecf4ea98f1d3
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue Dec 19 13:32:26 2017 +0200

tdf#114545 Enabling/Disabling Ok button depending on correct format

Change-Id: Iab3c4363dda0260d16c7167946044c39c21b863a
Reviewed-on: https://gerrit.libreoffice.org/46790
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 1a5ccb659943..4f9f82568d1a 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -772,9 +772,15 @@ IMPL_LINK( ScCondFormatDlg, EdRangeModifyHdl, Edit&, 
rEdit, void )
 ScRefFlags nFlags = aRange.Parse(aRangeStr, mpViewData->GetDocument(),
 mpViewData->GetDocument()->GetAddressConvention());
 if(nFlags & ScRefFlags::VALID)
+{
 
rEdit.SetControlBackground(GetSettings().GetStyleSettings().GetWindowColor());
+mpBtnOk->Enable(true);
+}
 else
+{
 rEdit.SetControlBackground(COL_LIGHTRED);
+mpBtnOk->Enable(false);
+}
 
 updateTitle();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/qa sw/source

[tagezi]

 sw/inc/swtypes.hxx  |2 -
 sw/inc/view.hxx |4 +--
 sw/qa/extras/ww8export/ww8export.cxx|2 -
 sw/source/core/fields/flddat.cxx|2 -
 sw/source/core/inc/swfont.hxx   |8 +++---
 sw/source/core/layout/fly.cxx   |   12 -
 sw/source/core/layout/ftnfrm.cxx|4 +--
 sw/source/core/layout/objectformatter.cxx   |4 +--
 sw/source/core/layout/sectfrm.cxx   |6 ++--
 sw/source/core/layout/tabfrm.cxx|2 -
 sw/source/core/layout/wsfrm.cxx |8 +++---
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |2 -
 sw/source/core/text/blink.cxx   |4 +--
 sw/source/core/txtnode/swfont.cxx   |6 ++--
 sw/source/filter/ww8/rtfattributeoutput.cxx |4 +--
 sw/source/filter/ww8/wrtww8gr.cxx   |   10 +++
 sw/source/filter/ww8/ww8par.cxx |   16 ++--
 sw/source/filter/ww8/ww8par6.cxx|6 ++--
 sw/source/filter/ww8/ww8scan.cxx|6 ++--
 sw/source/ui/frmdlg/frmpage.cxx |8 +++---
 sw/source/uibase/app/appenv.cxx |4 +--
 sw/source/uibase/shells/annotsh.cxx |2 -
 sw/source/uibase/shells/drwtxtsh.cxx|2 -
 sw/source/uibase/uiview/view2.cxx   |2 -
 sw/source/uibase/uiview/viewmdi.cxx |2 -
 sw/source/uibase/uiview/viewport.cxx|2 -
 26 files changed, 64 insertions(+), 66 deletions(-)

New commits:
commit baadb184e84568acd1c6efda95c3715b05818da3
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Dec 7 22:27:21 2017 +0200

tdf#96505 Deleted suffix long (L) where it is possible

Change-Id: Iafe5ea3822f7f0170d2fb041fea604e95dbfa015
Reviewed-on: https://gerrit.libreoffice.org/46041
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 226609ab668e..f4a8138d1ed8 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -85,7 +85,7 @@ const SwTwips lMinBorder = 1134;
 // Margin left and above document.
 // Half of it is gap between the pages.
 //TODO: Replace with SwViewOption::defDocumentBorder
-#define DOCUMENTBORDER  284L
+#define DOCUMENTBORDER  284
 
 // Constant strings.
 SW_DLLPUBLIC extern OUString aEmptyOUStr;  // remove once aEmptyOUStr can be 
changed to OUString
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index a865b4184ee5..6e8f4b7d9511 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -643,12 +643,12 @@ public:
 
 inline long SwView::GetXScroll() const
 {
-return m_aVisArea.GetWidth() * nScrollX / 100L;
+return (m_aVisArea.GetWidth() * nScrollX) / 100;
 }
 
 inline long SwView::GetYScroll() const
 {
-return m_aVisArea.GetHeight() * nScrollY / 100L;
+return (m_aVisArea.GetHeight() * nScrollY) / 100;
 }
 
 inline const SwDocShell *SwView::GetDocShell() const
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 825ba6be7cf0..fa143dad4e4b 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -50,8 +50,6 @@
 
 #include 
 
-#define convertTwipToMm100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36)/72L) : 
(((TWIP)*127L-36)/72L))
-
 class Test : public SwModelTestBase
 {
 public:
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index a8c0b6457594..ef12474832f2 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -73,7 +73,7 @@ OUString SwDateTimeField::Expand() const
 fVal = GetValue();
 
 if (nOffset)
-fVal += (double)(nOffset * 60L) / 86400.0;
+fVal += nOffset * ( 60 / 86400.0 );
 
 return ExpandValue(fVal, GetFormat(), GetLanguage());
 }
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index b44ab3494cd1..ee377c50c6fd 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -720,8 +720,8 @@ inline void SwSubFont::SetSize( const Size& rSize )
 else
 {
 Font::SetFontSize( Size(
-m_aSize.Width() * GetPropr() / 100L,
-m_aSize.Height() * GetPropr() / 100L ) );
+m_aSize.Width() * GetPropr() / 100,
+m_aSize.Height() * GetPropr() / 100 ) );
 }
 m_pMagic = nullptr;
 }
@@ -749,8 +749,8 @@ inline void SwFont::SetActual( SwFontScript nNew )
 inline void SwSubFont::SetProportion( const sal_uInt8 nNewPropr )
 {
 m_pMagic = nullpt

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - writerfilter/source

[tagezi]

 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   25 +---
 1 file changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 89853de3231e92a17a646acb7f99584220fadad8
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed Dec 6 21:23:37 2017 +0200

tdf#104650 Creating guard to reset status indicator

Change-Id: Ic1e79badedc031a588c0b07958002ad7c558ba82
Reviewed-on: https://gerrit.libreoffice.org/45987
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 58e4b36ace484f2743a3b9919d830c175464b05d)
Reviewed-on: https://gerrit.libreoffice.org/46006

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 44552eee5e5f..b905d8968a15 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -417,8 +417,30 @@ void OOXMLDocumentImpl::resolveFooter(Stream & rStream,
  }
 }
 
+namespace {
+// Ensures that the indicator is reset after exiting OOXMLDocumentImpl::resolve
+class StatusIndicatorGuard{
+public:
+explicit 
StatusIndicatorGuard(css::uno::Reference& 
xStatusIndicator)
+:mxStatusIndicator(xStatusIndicator)
+{
+}
+
+~StatusIndicatorGuard()
+{
+if (mxStatusIndicator.is())
+mxStatusIndicator->end();
+}
+
+private:
+css::uno::Reference mxStatusIndicator;
+};
+}
+
 void OOXMLDocumentImpl::resolve(Stream & rStream)
 {
+StatusIndicatorGuard aStatusIndicatorGuard(mxStatusIndicator);
+
 if 
(utl::MediaDescriptor(maMediaDescriptor).getUnpackedValueOrDefault("ReadGlossaries",
 false))
 {
 resolveFastSubStream(rStream, OOXMLStream::GLOSSARY);
@@ -515,9 +537,6 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
 "OOXMLDocumentImpl::resolve(): non-UNO exception");
 }
 }
-
-if (mxStatusIndicator.is())
-mxStatusIndicator->end();
 }
 
 void OOXMLDocumentImpl::incrementProgress()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   25 +---
 1 file changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 58e4b36ace484f2743a3b9919d830c175464b05d
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed Dec 6 21:23:37 2017 +0200

tdf#104650 Creating guard to reset status indicator

Change-Id: Ic1e79badedc031a588c0b07958002ad7c558ba82
Reviewed-on: https://gerrit.libreoffice.org/45987
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 2223b2a6c61c..c23aa86b464a 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -417,8 +417,30 @@ void OOXMLDocumentImpl::resolveFooter(Stream & rStream,
  }
 }
 
+namespace {
+// Ensures that the indicator is reset after exiting OOXMLDocumentImpl::resolve
+class StatusIndicatorGuard{
+public:
+explicit 
StatusIndicatorGuard(css::uno::Reference& 
xStatusIndicator)
+:mxStatusIndicator(xStatusIndicator)
+{
+}
+
+~StatusIndicatorGuard()
+{
+if (mxStatusIndicator.is())
+mxStatusIndicator->end();
+}
+
+private:
+css::uno::Reference mxStatusIndicator;
+};
+}
+
 void OOXMLDocumentImpl::resolve(Stream & rStream)
 {
+StatusIndicatorGuard aStatusIndicatorGuard(mxStatusIndicator);
+
 if 
(utl::MediaDescriptor(maMediaDescriptor).getUnpackedValueOrDefault("ReadGlossaries",
 false))
 {
 resolveFastSubStream(rStream, OOXMLStream::GLOSSARY);
@@ -515,9 +537,6 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
 "OOXMLDocumentImpl::resolve(): non-UNO exception");
 }
 }
-
-if (mxStatusIndicator.is())
-mxStatusIndicator->end();
 }
 
 void OOXMLDocumentImpl::incrementProgress()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 sc/source/ui/inc/output.hxx   |2 
 sc/source/ui/view/output2.cxx |  115 ++
 2 files changed, 41 insertions(+), 76 deletions(-)

New commits:
commit eafc42a2b46e70a0840a870b8c8cce85b32980c1
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Nov 24 19:55:15 2017 +0200

tdf#39593 deduplicate code in ScOutputData

Change-Id: I98fedf943e2e832d3171a3f2c88acb49acccaa2a
Reviewed-on: https://gerrit.libreoffice.org/45255
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index e68c92e9c379..a59b3937264b 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -252,6 +252,8 @@ private:
long nEngineHeight, bool 
bWrapFields );
 
 bool AdjustAreaParamClipRect(OutputAreaParam& rAreaParam);
+long SetEngineTextAndGetWidth( DrawEditParam& rParam, const OUString& 
rSetString,
+   long& rNeededPixel, long nAddWidthPixels );
 
 public:
 /**
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 3bb430f9883a..8195ad00fab6 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2801,6 +2801,22 @@ private:
 boolmbMetaFile;
 };
 
+// Returns needed width in current units; sets rNeededPixel to needed width in 
pixels
+long ScOutputData::SetEngineTextAndGetWidth( DrawEditParam& rParam, const 
OUString& rSetString,
+ long& rNeededPixel, long 
nAddWidthPixels )
+{
+rParam.mpEngine->SetText( rSetString );
+long nEngineWidth = static_cast( rParam.mpEngine->CalcTextWidth() );
+if ( rParam.mbPixelToLogic )
+rNeededPixel = mpRefDevice->LogicToPixel( Size( nEngineWidth, 0 ) 
).Width();
+else
+rNeededPixel = nEngineWidth;
+
+rNeededPixel += nAddWidthPixels;
+
+return nEngineWidth;
+}
+
 void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
 {
 OSL_ASSERT(rParam.meOrient == SvxCellOrientation::Standard);
@@ -2808,7 +2824,6 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
 
 Size aRefOne = mpRefDevice->PixelToLogic(Size(1,1));
 
-bool bHidden = false;
 bool bRepeat = (rParam.meHorJustAttr == SvxCellHorJustify::Repeat && 
!rParam.mbBreak);
 bool bShrink = !rParam.mbBreak && !bRepeat && 
lcl_GetBoolValue(*rParam.mpPattern, ATTR_SHRINKTOFIT, rParam.mpCondSet);
 long nAttrRotate = lcl_GetValue<SfxInt32Item, long>(*rParam.mpPattern, 
ATTR_ROTATE_VALUE, rParam.mpCondSet);
@@ -2831,12 +2846,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& 
rParam)
 {
 //! set flag to find the cell in DrawRotated again ?
 //! (or flag already set during DrawBackground, then no query here)
-bHidden = true; // rotated is outputted separately
+return; // rotated is outputted separately
 }
 
-if (bHidden)
-return;
-
 SvxCellHorJustify eOutHorJust = rParam.meHorJustContext;
 
 //! mirror margin values for RTL?
@@ -2951,11 +2963,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& 
rParam)
 {
 // "repeat" is handled with unformatted text (for performance 
reasons)
 OUString aCellStr = rParam.mpEngine->GetText();
-rParam.mpEngine->SetText( aCellStr );
 
-long nRepeatSize = (long) rParam.mpEngine->CalcTextWidth();
-if (rParam.mbPixelToLogic)
-nRepeatSize = 
mpRefDevice->LogicToPixel(Size(nRepeatSize,0)).Width();
+long nRepeatSize = 0;
+SetEngineTextAndGetWidth( rParam, aCellStr, nRepeatSize, 0 );
 if ( pFmtDevice != mpRefDevice )
 ++nRepeatSize;
 if ( nRepeatSize > 0 )
@@ -2966,29 +2976,20 @@ void ScOutputData::DrawEditStandard(DrawEditParam& 
rParam)
 OUString aRepeated = aCellStr;
 for ( long nRepeat = 1; nRepeat < nRepeatCount; 
nRepeat++ )
 aRepeated += aCellStr;
-rParam.mpEngine->SetText( aRepeated );
+
+nEngineWidth = SetEngineTextAndGetWidth( rParam, 
aRepeated,
+nNeededPixel, (nLeftM 
+ nRightM ) );
 
 nEngineHeight = rParam.mpEngine->GetTextHeight();
-nEngineWidth = (long) rParam.mpEngine->CalcTextWidth();
-if (rParam.mbPixelToLogic)
-nNeededPixel = 
mpRefDevice->LogicToPixel(Size(nEngineWidth,0)).Width(

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

[tagezi]

 sc/source/ui/inc/output.hxx   |2 
 sc/source/ui/view/output2.cxx |  178 +-
 2 files changed, 41 insertions(+), 139 deletions(-)

New commits:
commit 2f34bec2a7b939e24c3c5e884fdfe2057b732248
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed Nov 22 01:01:43 2017 +0200

tdf#39593 deduplicate code in ScOutputData

Change-Id: Ie7efcdf23e65b2047af7972756c2ba11cc178672
Reviewed-on: https://gerrit.libreoffice.org/45064
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 1e84d2920504..7abff2e541e2 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -250,6 +250,8 @@ private:
 bool Clip( DrawEditParam& rParam, const Size& aCellSize, OutputAreaParam& 
aAreaParam,
long nEngineHeight, bool bWrapFields);
 
+bool AdjustAreaParamClipRect(OutputAreaParam& aAreaParam);
+
 public:
 /**
  * @param nNewScrX: X-Offset in the output device for the table
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index a257c8f1a576..a3a0348a3dd5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1847,30 +1847,9 @@ tools::Rectangle ScOutputData::LayoutStrings(bool 
bPixelToLogic, bool bPaint, co
 long nOutHeight = aAreaParam.maAlignRect.GetHeight();
 
 bool bOutside = ( aAreaParam.maClipRect.Right() < nScrX || 
aAreaParam.maClipRect.Left() >= nScrX + nScrW );
-if ( aAreaParam.maClipRect.Left() < nScrX )
-{
-aAreaParam.maClipRect.Left() = nScrX;
-aAreaParam.mbLeftClip = true;
-}
-if ( aAreaParam.maClipRect.Right() > nScrX + nScrW )
-{
-aAreaParam.maClipRect.Right() = nScrX + nScrW; 
 //! minus one?
-aAreaParam.mbRightClip = true;
-}
-
+// Take adjusted values of aAreaParam.mbLeftClip and 
aAreaParam.mbRightClip
+bool bVClip = AdjustAreaParamClipRect(aAreaParam);
 bool bHClip = aAreaParam.mbLeftClip || 
aAreaParam.mbRightClip;
-bool bVClip = false;
-
-if ( aAreaParam.maClipRect.Top() < nScrY )
-{
-aAreaParam.maClipRect.Top() = nScrY;
-bVClip = true;
-}
-if ( aAreaParam.maClipRect.Bottom() > nScrY + nScrH )
-{
-aAreaParam.maClipRect.Bottom() = nScrY + nScrH;
 //! minus one?
-bVClip = true;
-}
 
 // check horizontal space
 
@@ -2740,6 +2719,35 @@ void 
ScOutputData::DrawEditParam::adjustForHyperlinkInPDF(Point aURLStart, const
 lcl_DoHyperlinkResult(pDev, aURLRect, maCell);
 }
 
+// Returns true if the rect is clipped vertically
+bool ScOutputData::AdjustAreaParamClipRect(OutputAreaParam& aAreaParam)
+{
+if( aAreaParam.maClipRect.Left() < nScrX )
+{
+aAreaParam.maClipRect.Left() = nScrX;
+aAreaParam.mbLeftClip = true;
+}
+if( aAreaParam.maClipRect.Right() > nScrX + nScrW )
+{
+aAreaParam.maClipRect.Right() = nScrX + nScrW;  //! minus one?
+aAreaParam.mbRightClip = true;
+}
+
+bool bVClip = false;
+
+if( aAreaParam.maClipRect.Top() < nScrY )
+{
+aAreaParam.maClipRect.Top() = nScrY;
+bVClip = true;
+}
+if( aAreaParam.maClipRect.Bottom() > nScrY + nScrH )
+{
+aAreaParam.maClipRect.Bottom() = nScrY + nScrH; //! minus one?
+bVClip = true;
+}
+return bVClip;
+}
+
 void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
 {
 OSL_ASSERT(rParam.meOrient == SvxCellOrientation::Standard);
@@ -2970,37 +2978,10 @@ void ScOutputData::DrawEditStandard(DrawEditParam& 
rParam)
 if (bOutside)
 return;
 
-if ( aAreaParam.maClipRect.Left() < nScrX )
-{
-aAreaParam.maClipRect.Left() = nScrX;
-aAreaParam.mbLeftClip = true;
-}
-if ( aAreaParam.maClipRect.Right() > nScrX + nScrW )
-{
-aAreaParam.maClipRect.Right() = nScrX + nScrW;  //! minus one?
-aAreaParam.mbRightClip = true;
-}
-
-bool bClip = aAreaParam.mbLeftClip || aAreaParam.mbRightClip;
+// Also take fields in a cell with automatic breaks into account: clip to 
cell width
+bool bClip = AdjustAreaParamClipRect(aAreaParam) || aAreaParam.mbLeftClip 
|| aAreaParam.mbRightClip || bWrapFields;
 bool bSimClip = false;
 
-if ( bWrapFields )
-{
-//  Fields in a cell with automatic breaks: clip to cell w

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

[tagezi]

 chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx |8 
 chart2/source/inc/chartview/ExplicitValueProvider.hxx   |   10 -
 chart2/source/view/main/ChartView.cxx   |   85 
+-
 3 files changed, 20 insertions(+), 83 deletions(-)

New commits:
commit a0ebba3d8855fee0bcec04a10137ae3a4f9f0e77
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue Nov 21 15:54:38 2017 +0200

tdf#39593 deduplicate code in ExplicitValueProvider

Change-Id: I0525761b0d1359b3e0f249cef02e1818af95156b
Reviewed-on: https://gerrit.libreoffice.org/45037
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx 
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index ffc60ec31ced..9c904996ebee 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -175,8 +175,8 @@ awt::Size Chart2ModelContact::GetPageSize() const
 
 awt::Rectangle Chart2ModelContact::SubstractAxisTitleSizes( const 
awt::Rectangle& rPositionRect )
 {
-awt::Rectangle aRect = ExplicitValueProvider::substractAxisTitleSizes(
-*mpModel, getChartView(), rPositionRect );
+awt::Rectangle aRect = ExplicitValueProvider::AddSubtractAxisTitleSizes(
+*mpModel, getChartView(), rPositionRect, true );
 return aRect;
 }
 
@@ -185,8 +185,8 @@ awt::Rectangle 
Chart2ModelContact::GetDiagramRectangleIncludingTitle() const
 awt::Rectangle aRect( GetDiagramRectangleIncludingAxes() );
 
 //add axis title sizes to the diagram size
-aRect = ExplicitValueProvider::addAxisTitleSizes(
-*mpModel, getChartView(), aRect );
+aRect = ExplicitValueProvider::AddSubtractAxisTitleSizes(
+*mpModel, getChartView(), aRect, false );
 
 return aRect;
 }
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx 
b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 05d50c6a2e82..afe0507d67d2 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -66,16 +66,10 @@ public:
 static ExplicitValueProvider* getExplicitValueProvider( const 
css::uno::Reference< css::uno::XInterface >& xChartView );
 
 static css::awt::Rectangle
-addAxisTitleSizes(
+AddSubtractAxisTitleSizes(
 ChartModel& rModel
 , const css::uno::Reference< css::uno::XInterface >& xChartView
-, const css::awt::Rectangle& rExcludingPositionAndSize );
-
-static css::awt::Rectangle
-substractAxisTitleSizes(
-ChartModel& rModel
-, const css::uno::Reference< css::uno::XInterface >& xChartView
-, const css::awt::Rectangle& rPositionAndSizeIncludingTitles );
+, const css::awt::Rectangle& rPositionAndSize, bool bSubtract );
 
 static sal_Int32 getExplicitNumberFormatKeyForAxis(
   const css::uno::Reference< css::chart2::XAxis >& xAxis
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 49f1670e9f37..97a51c55c961 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2089,12 +2089,12 @@ sal_Int32 
ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe
 return nFormat;
 }
 
-awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
+awt::Rectangle ExplicitValueProvider::AddSubtractAxisTitleSizes(
 ChartModel& rModel
 , const Reference< uno::XInterface >& xChartView
-, const awt::Rectangle& rExcludingPositionAndSize )
+, const awt::Rectangle& rPositionAndSize, bool bSubtract )
 {
-awt::Rectangle aRet(rExcludingPositionAndSize);
+awt::Rectangle aRet(rPositionAndSize);
 
 //add axis title sizes to the diagram size
 uno::Reference< chart2::XTitle > xTitle_Height( TitleHelper::getTitle( 
TitleHelper::TITLE_AT_STANDARD_X_AXIS_POSITION, rModel ) );
@@ -2146,78 +2146,21 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
 if( nSecondTitleSpaceWidth )
 nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace();
 }
-
-aRet.X -= nTitleSpaceWidth;
-aRet.Y -= nSecondTitleSpaceHeight;
-aRet.Width += nTitleSpaceWidth + nSecondTitleSpaceWidth;
-aRet.Height += nTitleSpaceHeight + nSecondTitleSpaceHeight;
-}
-}
-return aRet;
-}
-
-awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes(
-ChartModel& rModel
-, const Reference< uno::XInterface >& xChartView
-, const awt::Rectangle& rPositionAndSizeIncludingTitles )
-{
-awt::Rectan

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

[tagezi]

 basctl/source/basicide/scriptdocument.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 94c76b6d267ba72177e1144b408b0343d8385c37
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 20 13:08:31 2017 +0200

renameModuleOrDialog: add missing check for valid Reference

Change-Id: I2cf33a4fae4db45b854e77e31e166afa0281a054
Reviewed-on: https://gerrit.libreoffice.org/44956
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index a7b16505d1a5..00135960566a 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -641,7 +641,7 @@ namespace basctl
 if ( _eType == E_SCRIPTS )
 {
 Reference< XVBAModuleInfo > xVBAModuleInfo( xLib, UNO_QUERY );
-if ( xVBAModuleInfo->hasModuleInfo( _rOldName ) )
+if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( 
_rOldName ) )
 {
 ModuleInfo sModuleInfo = xVBAModuleInfo->getModuleInfo( 
_rOldName );
 xVBAModuleInfo->removeModuleInfo( _rOldName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 basctl/source/basicide/scriptdocument.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9abd653129986d5aa8a07b8f8bb92b2d4254126e
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 20 10:02:30 2017 +0200

tdf#108872 Also remove VBA module info on module removal

If this information is left, then css.container.ElementExistException
is thrown on following creation of a module with the same name in
XVBAModuleInfo::insertModuleInfo called from
ScriptDocument::Impl::createModule
(see commit 2be139d76bdb66e77719613d802dc0047c284456)

Change-Id: I6750819ce36c112c146d7800a6bab4cc207e0062
Reviewed-on: https://gerrit.libreoffice.org/44940
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basctl/source/basicide/scriptdocument.cxx 
b/basctl/source/basicide/scriptdocument.cxx
index 733cebdbb679..a7b16505d1a5 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -527,6 +527,9 @@ namespace basctl
 if ( xLib.is() )
 {
 xLib->removeByName( _rModuleName );
+Reference< XVBAModuleInfo > xVBAModuleInfo(xLib, 
UNO_QUERY);
+if(xVBAModuleInfo.is() && 
xVBAModuleInfo->hasModuleInfo(_rModuleName))
+xVBAModuleInfo->removeModuleInfo(_rModuleName);
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 basctl/uiconfig/basicide/menubar/menubar.xml  |   73 
--
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |   13 +
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu  |   10 -
 3 files changed, 79 insertions(+), 17 deletions(-)

New commits:
commit 4378108d06996e3ae11dded572e52fc22b5ff432
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue May 30 22:33:02 2017 +0300

Reorganize the main menu Basic IDE

Added to File menu Import and Export Basic and Dialog items
Added to Tools menu Breakpoint On/Off, Manager Breakpoints, Enable Watch,
  Find Parenthesis items
Move Macros menu to level up and del Run, Edit and Organize Dialog items
Added Run menu with Run, Stop, Compile, Step Over, Step Into, Step Out items
Added Dialog menu with Organize Dialog, Preview Dialog, Manage Language and
  items from FormControls toolbar
Renamed items Save BASIC to Export Basic, Insert BASIC Source to Import 
Basic,
  Run BASIC to Run, Stop Macro to Stop, and Select to Select Element

Change-Id: Id4a585d595afa8274e77d5fda0f00c468d7d63df
Reviewed-on: https://gerrit.libreoffice.org/38232
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.he...@googlemail.com>

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 6cee9b9d61f8..feb6c99bccbd 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -27,12 +27,17 @@
 
 
 
-
 
 
 
 
 
+
+
+
+
+
+
 
 
 
@@ -63,25 +68,71 @@
 
 
 
+
+
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
 
-
 
 
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index 7df7d91debb7..93e1f99fbf72 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
@@ -95,6 +95,17 @@
 
   
 
-
+
+  
+
+  ~Run
+
+  
+  
+
+  ~Dialog
+
+  
+
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index e8488ad6de45..f815b33ac341 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3286,7 +3286,7 @@
   
   
 
-  Select
+  Select Element
 
 
   1
@@ -4948,7 +4948,7 @@
   
   
 
-  Insert BASIC Source
+  Import Basic
 
 
   1
@@ -4956,7 +4956,7 @@
   
   
 
-  Save BASIC
+  Export Basic
 
 
   1
@@ -4988,7 +4988,7 @@
   
   
 
-  Run BASIC
+  Run
 
 
   1
@@ -5012,7 +5012,7 @@
   
   
 
-  Stop Macro
+  Stop
 
 
   1
___
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' - comphelper/source

[tagezi]

 comphelper/source/misc/syntaxhighlight.cxx |   36 ++---
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 2121ed8c14763c465ed913982b36328c21c313f4
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri May 26 17:39:35 2017 +0300

tdf#36541 Wrong syntax highlighting in BASIC IDE

-- and // are not comments in Basic

Change-Id: I6cd16f2d19eec280ead7d59a6162cd03ac267474
Reviewed-on: https://gerrit.libreoffice.org/38074
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 6dbf9543c6f83d7b1fe7ad27232f65152456619a)
Reviewed-on: https://gerrit.libreoffice.org/38089

diff --git a/comphelper/source/misc/syntaxhighlight.cxx 
b/comphelper/source/misc/syntaxhighlight.cxx
index bcfdb3f15fa0..f27a993a1c3f 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -395,7 +395,7 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const 
sal_Unicode*& pos, /*out*/
 else if ( testCharFlags( c, CharFlags::Operator ) || ( (c == '\'') && 
(aLanguage==HighlighterLanguage::Basic)) )
 {
 // parameters for SQL view
-if ( (c==':') || (c=='?'))
+if (((c==':') || (c=='?')) && (aLanguage == HighlighterLanguage::SQL))
 {
 if (c!='?')
 {
@@ -412,7 +412,7 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const 
sal_Unicode*& pos, /*out*/
 }
 reType = TokenType::Parameter;
 }
-else if (c=='-')
+else if ((c=='-') && (aLanguage == HighlighterLanguage::SQL))
 {
 sal_Unicode cPeekNext = *pos;
 if (cPeekNext=='-')
@@ -426,24 +426,24 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const 
sal_Unicode*& pos, /*out*/
 reType = TokenType::Comment;
 }
 }
-   else if (c=='/')
-   {
-   sal_Unicode cPeekNext = *pos;
-   if (cPeekNext=='/')
-   {
-   // Remove all characters until end of line or EOF
-   while( cPeekNext != 0 && !testCharFlags( cPeekNext, 
CharFlags::EOL ) )
-   {
-   ++pos;
-   cPeekNext = *pos;
-   }
-   reType = TokenType::Comment;
-   }
-   }
+else if ((c=='/') && (aLanguage == HighlighterLanguage::SQL))
+{
+sal_Unicode cPeekNext = *pos;
+if (cPeekNext=='/')
+{
+// Remove all characters until end of line or EOF
+while( cPeekNext != 0 && !testCharFlags( cPeekNext, 
CharFlags::EOL ) )
+{
+++pos;
+cPeekNext = *pos;
+}
+reType = TokenType::Comment;
+}
+}
 else
 {
-// Comment?
-if ( c == '\'' )
+// Apostrophe is Basic comment
+if (( c == '\'') && (aLanguage == HighlighterLanguage::Basic))
 {
 // Skip all characters until end of input or end of line:
 for (;;) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 comphelper/source/misc/syntaxhighlight.cxx |   36 ++---
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 6dbf9543c6f83d7b1fe7ad27232f65152456619a
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri May 26 17:39:35 2017 +0300

tdf#36541 Wrong syntax highlighting in BASIC IDE

-- and // are not comments in Basic

Change-Id: I6cd16f2d19eec280ead7d59a6162cd03ac267474
Reviewed-on: https://gerrit.libreoffice.org/38074
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/comphelper/source/misc/syntaxhighlight.cxx 
b/comphelper/source/misc/syntaxhighlight.cxx
index bcfdb3f15fa0..f27a993a1c3f 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -395,7 +395,7 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const 
sal_Unicode*& pos, /*out*/
 else if ( testCharFlags( c, CharFlags::Operator ) || ( (c == '\'') && 
(aLanguage==HighlighterLanguage::Basic)) )
 {
 // parameters for SQL view
-if ( (c==':') || (c=='?'))
+if (((c==':') || (c=='?')) && (aLanguage == HighlighterLanguage::SQL))
 {
 if (c!='?')
 {
@@ -412,7 +412,7 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const 
sal_Unicode*& pos, /*out*/
 }
 reType = TokenType::Parameter;
 }
-else if (c=='-')
+else if ((c=='-') && (aLanguage == HighlighterLanguage::SQL))
 {
 sal_Unicode cPeekNext = *pos;
 if (cPeekNext=='-')
@@ -426,24 +426,24 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const 
sal_Unicode*& pos, /*out*/
 reType = TokenType::Comment;
 }
 }
-   else if (c=='/')
-   {
-   sal_Unicode cPeekNext = *pos;
-   if (cPeekNext=='/')
-   {
-   // Remove all characters until end of line or EOF
-   while( cPeekNext != 0 && !testCharFlags( cPeekNext, 
CharFlags::EOL ) )
-   {
-   ++pos;
-   cPeekNext = *pos;
-   }
-   reType = TokenType::Comment;
-   }
-   }
+else if ((c=='/') && (aLanguage == HighlighterLanguage::SQL))
+{
+sal_Unicode cPeekNext = *pos;
+if (cPeekNext=='/')
+{
+// Remove all characters until end of line or EOF
+while( cPeekNext != 0 && !testCharFlags( cPeekNext, 
CharFlags::EOL ) )
+{
+++pos;
+cPeekNext = *pos;
+}
+reType = TokenType::Comment;
+}
+}
 else
 {
-// Comment?
-if ( c == '\'' )
+// Apostrophe is Basic comment
+if (( c == '\'') && (aLanguage == HighlighterLanguage::Basic))
 {
 // Skip all characters until end of input or end of line:
 for (;;) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 basctl/source/basicide/baside2.cxx |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit d0c0ebbcabb67b8dfd130cf4e9e666bba229f846
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri May 26 08:33:18 2017 +0300

deleted variable bAdd because it does not make sense

Change-Id: Ib65c38c7e99ff4667c021240a1412c8f57f53cbe
Reviewed-on: https://gerrit.libreoffice.org/38050
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index f0070aa5fe01..c85863afdd2f 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -669,7 +669,6 @@ BasicDebugFlags ModulWindow::BasicBreakHdl( StarBASIC* 
pBasic )
 void ModulWindow::BasicAddWatch()
 {
 AssertValidEditEngine();
-bool bAdd = true;
 if ( !GetEditView()->HasSelection() )
 {
 TextPaM aWordStart;
@@ -679,15 +678,12 @@ void ModulWindow::BasicAddWatch()
 TextSelection aSel( aWordStart );
 aSel.GetEnd().GetIndex() += aWord.getLength();
 GetEditView()->SetSelection( aSel );
-bAdd = true;
 }
 }
-if ( bAdd )
-{
-TextSelection aSel = GetEditView()->GetSelection();
-if ( aSel.GetStart().GetPara() == aSel.GetEnd().GetPara() ) // single 
line selection
-m_rLayout.BasicAddWatch(GetEditView()->GetSelected());
-}
+
+TextSelection aSel = GetEditView()->GetSelection();
+if ( aSel.GetStart().GetPara() == aSel.GetEnd().GetPara() ) // single line 
selection
+m_rLayout.BasicAddWatch(GetEditView()->GetSelected());
 }
 
 
___
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' - basctl/source officecfg/registry

[tagezi]

 basctl/source/basicide/baside2.cxx   |   23 ++-
 officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs |   11 +
 2 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit f80c3e37e59285875bc9ec025661bcf1b8fc60eb
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed May 24 23:56:57 2017 +0300

tdf#91913 Saving line numbering into setting

It saves setting of the line numbering for next start
Now the line numbering is enabled by default

Change-Id: Ib658d417882996eb843fed9b236496fe2fb42166
Reviewed-on: https://gerrit.libreoffice.org/38013
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 3bdd04cd54a42a98f7f679e749f3da0f164ac18f)
Reviewed-on: https://gerrit.libreoffice.org/38031

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index fb9f3d11939f..f0070aa5fe01 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -23,6 +23,7 @@
 #include "iderdll.hxx"
 #include "moduldlg.hxx"
 #include "docsignature.hxx"
+#include "officecfg/Office/BasicIDE.hxx"
 
 #include "helpid.hrc"
 #include 
@@ -172,10 +173,6 @@ void lcl_ConvertTabsToSpaces( OUString& rLine )
 }
 }
 
-// until we have some configuration lets just keep
-// persist this value for the process lifetime
-bool bSourceLinesEnabled = false;
-
 } // namespace
 
 ModulWindow::ModulWindow (ModulWindowLayout* pParent, ScriptDocument const& 
rDocument,
@@ -985,8 +982,12 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
 case SID_SHOWLINES:
 {
 const SfxBoolItem* pItem = 
rReq.GetArg(rReq.GetSlot());
-bSourceLinesEnabled = pItem && pItem->GetValue();
-m_aXEditorWindow->SetLineNumberDisplay(bSourceLinesEnabled);
+bool bLineNumbers = pItem && pItem->GetValue();
+m_aXEditorWindow->SetLineNumberDisplay(bLineNumbers);
+
+std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::BasicIDE::EditorSettings::LineNumbering::set(bLineNumbers, 
batch);
+batch->commit();
 }
 break;
 case SID_BASICIDE_DELETECURRENT:
@@ -1121,7 +1122,8 @@ void ModulWindow::GetState( SfxItemSet  )
 break;
 case SID_SHOWLINES:
 {
-rSet.Put(SfxBoolItem(nWh, bSourceLinesEnabled));
+bool bLineNumbers = 
::officecfg::Office::BasicIDE::EditorSettings::LineNumbering::get();
+rSet.Put(SfxBoolItem(nWh, bLineNumbers));
 break;
 }
 case SID_SELECTALL:
@@ -1188,7 +1190,8 @@ void ModulWindow::AssertValidEditEngine()
 
 void ModulWindow::Activating ()
 {
-m_aXEditorWindow->SetLineNumberDisplay(bSourceLinesEnabled);
+bool bLineNumbers = 
::officecfg::Office::BasicIDE::EditorSettings::LineNumbering::get();
+m_aXEditorWindow->SetLineNumberDisplay(bLineNumbers);
 Show();
 }
 
@@ -1370,7 +1373,8 @@ bool ModulWindow::IsPasteAllowed()
 
 void ModulWindow::OnNewDocument ()
 {
-m_aXEditorWindow->SetLineNumberDisplay(bSourceLinesEnabled);
+bool bLineNumbers = 
::officecfg::Office::BasicIDE::EditorSettings::LineNumbering::get();
+m_aXEditorWindow->SetLineNumberDisplay(bLineNumbers);
 }
 
 char const* ModulWindow::GetHid () const
@@ -1566,7 +1570,6 @@ void ModulWindowLayout::SyntaxColors::NewConfig (bool 
bFirst)
 pEditor->UpdateSyntaxHighlighting();
 }
 
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs 
b/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs
index 9bf9b3dfd238..94f108c179bf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs
@@ -63,5 +63,16 @@
 false
 
 
+
+
+Contains user configuration.
+
+
+
+Sets the line numbering on/off. Default is true.
+
+true
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 basctl/source/basicide/baside2.cxx   |   23 ++-
 officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs |   11 +
 2 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 3bdd04cd54a42a98f7f679e749f3da0f164ac18f
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed May 24 23:56:57 2017 +0300

tdf#91913 Saving line numbering into setting

It saves setting of the line numbering for next start
Now the line numbering is enabled by default

Change-Id: Ib658d417882996eb843fed9b236496fe2fb42166
Reviewed-on: https://gerrit.libreoffice.org/38013
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index fb9f3d11939f..f0070aa5fe01 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -23,6 +23,7 @@
 #include "iderdll.hxx"
 #include "moduldlg.hxx"
 #include "docsignature.hxx"
+#include "officecfg/Office/BasicIDE.hxx"
 
 #include "helpid.hrc"
 #include 
@@ -172,10 +173,6 @@ void lcl_ConvertTabsToSpaces( OUString& rLine )
 }
 }
 
-// until we have some configuration lets just keep
-// persist this value for the process lifetime
-bool bSourceLinesEnabled = false;
-
 } // namespace
 
 ModulWindow::ModulWindow (ModulWindowLayout* pParent, ScriptDocument const& 
rDocument,
@@ -985,8 +982,12 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
 case SID_SHOWLINES:
 {
 const SfxBoolItem* pItem = 
rReq.GetArg(rReq.GetSlot());
-bSourceLinesEnabled = pItem && pItem->GetValue();
-m_aXEditorWindow->SetLineNumberDisplay(bSourceLinesEnabled);
+bool bLineNumbers = pItem && pItem->GetValue();
+m_aXEditorWindow->SetLineNumberDisplay(bLineNumbers);
+
+std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::BasicIDE::EditorSettings::LineNumbering::set(bLineNumbers, 
batch);
+batch->commit();
 }
 break;
 case SID_BASICIDE_DELETECURRENT:
@@ -1121,7 +1122,8 @@ void ModulWindow::GetState( SfxItemSet  )
 break;
 case SID_SHOWLINES:
 {
-rSet.Put(SfxBoolItem(nWh, bSourceLinesEnabled));
+bool bLineNumbers = 
::officecfg::Office::BasicIDE::EditorSettings::LineNumbering::get();
+rSet.Put(SfxBoolItem(nWh, bLineNumbers));
 break;
 }
 case SID_SELECTALL:
@@ -1188,7 +1190,8 @@ void ModulWindow::AssertValidEditEngine()
 
 void ModulWindow::Activating ()
 {
-m_aXEditorWindow->SetLineNumberDisplay(bSourceLinesEnabled);
+bool bLineNumbers = 
::officecfg::Office::BasicIDE::EditorSettings::LineNumbering::get();
+m_aXEditorWindow->SetLineNumberDisplay(bLineNumbers);
 Show();
 }
 
@@ -1370,7 +1373,8 @@ bool ModulWindow::IsPasteAllowed()
 
 void ModulWindow::OnNewDocument ()
 {
-m_aXEditorWindow->SetLineNumberDisplay(bSourceLinesEnabled);
+bool bLineNumbers = 
::officecfg::Office::BasicIDE::EditorSettings::LineNumbering::get();
+m_aXEditorWindow->SetLineNumberDisplay(bLineNumbers);
 }
 
 char const* ModulWindow::GetHid () const
@@ -1566,7 +1570,6 @@ void ModulWindowLayout::SyntaxColors::NewConfig (bool 
bFirst)
 pEditor->UpdateSyntaxHighlighting();
 }
 
-
 } // namespace basctl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs 
b/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs
index 9bf9b3dfd238..94f108c179bf 100644
--- a/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs
@@ -63,5 +63,16 @@
 false
 
 
+
+
+Contains user configuration.
+
+
+
+Sets the line numbering on/off. Default is true.
+
+true
+
+
 
 
___
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' - basctl/uiconfig

[tagezi]

 basctl/uiconfig/basicide/menubar/menubar.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7c0b8c2e818a4f59ef9003529673bdbfa8ad188
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue May 23 09:12:10 2017 +0300

The menu items are moved according to a general design concept

Close item was moved to up the first section of File menu
GoToLine item was moved from View menu to Edit menu under Find

Change-Id: I2d2561848917c2e6f22baf92030c7b5d147a56bb
Reviewed-on: https://gerrit.libreoffice.org/37937
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
(cherry picked from commit 990277913a55bf7b0b920affe697460b24920c10)
Reviewed-on: https://gerrit.libreoffice.org/37964
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 9c2528fe6c30..45e667b37c99 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -22,10 +22,10 @@
 
 
 
+
 
 
 
-
 
 
 
@@ -53,6 +53,7 @@
 
 
 
+
 
 
 
@@ -61,7 +62,6 @@
 
 
 
-
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/uiconfig

[tagezi]

 basctl/uiconfig/basicide/menubar/menubar.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 990277913a55bf7b0b920affe697460b24920c10
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue May 23 09:12:10 2017 +0300

The menu items are moved according to a general design concept

Close item was moved to up the first section of File menu
GoToLine item was moved from View menu to Edit menu under Find

Change-Id: I2d2561848917c2e6f22baf92030c7b5d147a56bb
Reviewed-on: https://gerrit.libreoffice.org/37937
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 9c2528fe6c30..45e667b37c99 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -22,10 +22,10 @@
 
 
 
+
 
 
 
-
 
 
 
@@ -53,6 +53,7 @@
 
 
 
+
 
 
 
@@ -61,7 +62,6 @@
 
 
 
-
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 desktop/source/app/cmdlinehelp.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 2c9972b8d40dce72cc6f56f1d44db838bd0ece10
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sat Dec 17 17:23:56 2016 +0200

tdf#104441 Addition to output to the console help

There is no documentation in the help on how to open a file and 
automatically
run a macro

Change-Id: I94c5e87ae0f573a5546a83b118021744b439c7cd
Reviewed-on: https://gerrit.libreoffice.org/32122
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index 6103c90..27e4d81 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -40,6 +40,13 @@ namespace desktop
 const char aCmdLineHelp[] =
 "Usage: %CMDNAME [argument...]\n"
 "   argument - switches, switch parameters and document URIs 
(filenames).\n\n"
+"Using without special arguments:\n"
+"Opens the start center, if it is used without any arguments.\n"
+"   {file}  Tries to open the file (files) in the 
components\n"
+"   suitable for them.\n"
+"   {file} {macro:///Library.Module.MacroName}\n"
+"   Opens the file and runs specified macros 
from\n"
+"   the file.\n\n"
 "Getting help and information:\n"
 "   --help | -h | -?Shows this help and quits.\n"
 "   --helpwriterOpens built-in or online Help on Writer.\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-5-3' - source/text

[tagezi]

 source/text/shared/guide/start_parameters.xhp |  843 --
 1 file changed, 535 insertions(+), 308 deletions(-)

New commits:
commit 10f89a1accd555be0555e5e17c777012edc48430
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sun Dec 4 12:30:34 2016 +0200

tdf#100836 "Starting the LibreOffice Software With Parameters" help update

rewritten cmdHelp in accordance with the attached document in bug tdf#100836

Change-Id: I6061dab2ed83a2be0653fbbd422e3193386d9d98
Reviewed-on: https://gerrit.libreoffice.org/31595
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>
(cherry picked from commit 47ad5a2f2102740bda4cf02dcd73562da79f67a9)
Reviewed-on: https://gerrit.libreoffice.org/31919
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/source/text/shared/guide/start_parameters.xhp 
b/source/text/shared/guide/start_parameters.xhp
index c03c0bf..f54de06 100644
--- a/source/text/shared/guide/start_parameters.xhp
+++ b/source/text/shared/guide/start_parameters.xhp
@@ -1,6 +1,5 @@
 
 
-
 
-   
+
 
-
-
-Starting the $[officename] Software With 
Parameters
-/text/shared/guide/start_parameters.xhp
-
-
+
+
+Starting $[officename] Software 
With Parameters
+/text/shared/guide/start_parameters.xhp
+
+
 
-
-start parameters
-command line parameters
-parameters;command line
-arguments in command line
-
-Starting the $[officename] Software With 
Parameters
-By starting the $[officename] software from the command line you can 
assign various parameters, with which you can influence the performance. The 
use of command line parameters is only recommended for experienced 
users.
-For normal handling, the use of command line parameters is not 
necessary. A few of the parameters require a deeper knowledge of the technical 
background of the $[officename] software technology.
-Starting the $[officename] Software From the Command 
Line
-
-
-Under Windows, select Run from the Windows Start menu, 
or open a shell under Linux, *BSD, or Mac OS X platforms.
-
-
-Under Windows, type the following text in the Open text 
field and click OK. 
-
-
-Under UNIX-like systems, type the following line of text, then 
press Return:
-{install}\program\soffice.exe {parameter} 
-{install}/program/soffice {parameter} 
-
-Replace {install} with the path to your installation of 
the $[officename] software (for example, C:\Program Files\Office, 
or ~/office)
-Where required, replace {parameter} with one or more of 
the following command line parameters.
-
-
-Valid Command Line Parameters
-
-
-
-Parameter
-
-
-Meaning
-
-
-
-
---help / -h / -?
-
-
-Lists the available command line parameters in a dialog box
-to the 
console.
-
-
-
-
---version
-
-
-Displays the version information.
-
-
-
-
---writer
-
-
-Starts with an empty Writer document.
-
-
-
-
---calc
-
-
-Starts with an empty Calc document.
-
-
-
-
---draw
-
-
-Starts with an empty Draw document.
-
-
-
-
---impress
-
-
-Starts with an empty Impress document.
-
-
-
-
---math
-
-
-Starts with an empty Math document.
-
-
-
-
---global
-
-
-Starts with an empty Writer master document.
-
-
-
-
---web
-
-
-Starts with an empty HTML document.
-
-
-
-
---show {filename.odp}
-
-
-Starts with the Impress file {filename.odp} and starts 
the presentation. Enters edit mode after the presentation.
-
-
-
-
---minimized
-
-
-Starts minimized. The splash screen is not displayed.
-
-
-
-
---invisible
-
-
-Starts in invisible mode.
-Neither the start-up logo nor the initial program window will be 
visible. However, the $[officename] software can be controlled and documents 
and dialogs opened via the http://api.libreoffice.org; 
name="API">API. 
-When the $[officename] software has been started with this 
parameter, it can only be ended using the taskmanager (Windows) or the 
kill command (UNIX-like systems).
-It cannot be used in conjunction with 
-quickstart.
-More information is found in the $[officename] Developer's 
Guide.
-
-
-
-
---norestore
-
-
-Disables restart and file recovery after a system crash.
-
-
-
-
---nofirststartwizard
-
-
-Disables the Welcome Wizard.
-
-
-
-
---quickstart
-
-
-Activates the Quickstarter.now on UNIX 
too
-
-
-
-
---accept={UNO string}
-
-
-Notifies the $[officename] software that upon the creation of "UNO 
Acceptor Threads", a "UNO Accept String" will be used.
-More information is found in the $[officename] Developer's 
Guide.
-
-
-
-
---unaccept={UNO string}
-
-
-Closes an acceptor that was created with --accept={UNO string}. Use 
--unaccept=all to close all open acceptors.
-
-
-
-
--p {filename1} {filename2} ...
-
-
-Prints the files {filename1} {filename2} ... to the 
default printer and ends. The splash screen does not appear.
-If the file name contains spaces,

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6cac8655e372bfceb011fc382fac156c8fae64d7
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sun Dec 4 12:30:34 2016 +0200

Updated core
Project: help  10f89a1accd555be0555e5e17c777012edc48430

tdf#100836 "Starting the LibreOffice Software With Parameters" help update

rewritten cmdHelp in accordance with the attached document in bug tdf#100836

Change-Id: I6061dab2ed83a2be0653fbbd422e3193386d9d98
Reviewed-on: https://gerrit.libreoffice.org/31595
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>
(cherry picked from commit 47ad5a2f2102740bda4cf02dcd73562da79f67a9)
Reviewed-on: https://gerrit.libreoffice.org/31919
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/helpcontent2 b/helpcontent2
index 90b439d..10f89a1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 90b439d73faed542e01ae08e973ddb5b3dcc0bf2
+Subproject commit 10f89a1accd555be0555e5e17c777012edc48430
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/shared/guide/start_parameters.xhp |  843 --
 1 file changed, 535 insertions(+), 308 deletions(-)

New commits:
commit 47ad5a2f2102740bda4cf02dcd73562da79f67a9
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sun Dec 4 12:30:34 2016 +0200

tdf#100836 "Starting the LibreOffice Software With Parameters" help update

rewritten cmdHelp in accordance with the attached document in bug tdf#100836

Change-Id: I6061dab2ed83a2be0653fbbd422e3193386d9d98
Reviewed-on: https://gerrit.libreoffice.org/31595
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/source/text/shared/guide/start_parameters.xhp 
b/source/text/shared/guide/start_parameters.xhp
index c03c0bf..f54de06 100644
--- a/source/text/shared/guide/start_parameters.xhp
+++ b/source/text/shared/guide/start_parameters.xhp
@@ -1,6 +1,5 @@
 
 
-
 
-   
+
 
-
-
-Starting the $[officename] Software With 
Parameters
-/text/shared/guide/start_parameters.xhp
-
-
+
+
+Starting $[officename] Software 
With Parameters
+/text/shared/guide/start_parameters.xhp
+
+
 
-
-start parameters
-command line parameters
-parameters;command line
-arguments in command line
-
-Starting the $[officename] Software With 
Parameters
-By starting the $[officename] software from the command line you can 
assign various parameters, with which you can influence the performance. The 
use of command line parameters is only recommended for experienced 
users.
-For normal handling, the use of command line parameters is not 
necessary. A few of the parameters require a deeper knowledge of the technical 
background of the $[officename] software technology.
-Starting the $[officename] Software From the Command 
Line
-
-
-Under Windows, select Run from the Windows Start menu, 
or open a shell under Linux, *BSD, or Mac OS X platforms.
-
-
-Under Windows, type the following text in the Open text 
field and click OK. 
-
-
-Under UNIX-like systems, type the following line of text, then 
press Return:
-{install}\program\soffice.exe {parameter} 
-{install}/program/soffice {parameter} 
-
-Replace {install} with the path to your installation of 
the $[officename] software (for example, C:\Program Files\Office, 
or ~/office)
-Where required, replace {parameter} with one or more of 
the following command line parameters.
-
-
-Valid Command Line Parameters
-
-
-
-Parameter
-
-
-Meaning
-
-
-
-
---help / -h / -?
-
-
-Lists the available command line parameters in a dialog box
-to the 
console.
-
-
-
-
---version
-
-
-Displays the version information.
-
-
-
-
---writer
-
-
-Starts with an empty Writer document.
-
-
-
-
---calc
-
-
-Starts with an empty Calc document.
-
-
-
-
---draw
-
-
-Starts with an empty Draw document.
-
-
-
-
---impress
-
-
-Starts with an empty Impress document.
-
-
-
-
---math
-
-
-Starts with an empty Math document.
-
-
-
-
---global
-
-
-Starts with an empty Writer master document.
-
-
-
-
---web
-
-
-Starts with an empty HTML document.
-
-
-
-
---show {filename.odp}
-
-
-Starts with the Impress file {filename.odp} and starts 
the presentation. Enters edit mode after the presentation.
-
-
-
-
---minimized
-
-
-Starts minimized. The splash screen is not displayed.
-
-
-
-
---invisible
-
-
-Starts in invisible mode.
-Neither the start-up logo nor the initial program window will be 
visible. However, the $[officename] software can be controlled and documents 
and dialogs opened via the http://api.libreoffice.org; 
name="API">API. 
-When the $[officename] software has been started with this 
parameter, it can only be ended using the taskmanager (Windows) or the 
kill command (UNIX-like systems).
-It cannot be used in conjunction with 
-quickstart.
-More information is found in the $[officename] Developer's 
Guide.
-
-
-
-
---norestore
-
-
-Disables restart and file recovery after a system crash.
-
-
-
-
---nofirststartwizard
-
-
-Disables the Welcome Wizard.
-
-
-
-
---quickstart
-
-
-Activates the Quickstarter.now on UNIX 
too
-
-
-
-
---accept={UNO string}
-
-
-Notifies the $[officename] software that upon the creation of "UNO 
Acceptor Threads", a "UNO Accept String" will be used.
-More information is found in the $[officename] Developer's 
Guide.
-
-
-
-
---unaccept={UNO string}
-
-
-Closes an acceptor that was created with --accept={UNO string}. Use 
--unaccept=all to close all open acceptors.
-
-
-
-
--p {filename1} {filename2} ...
-
-
-Prints the files {filename1} {filename2} ... to the 
default printer and ends. The splash screen does not appear.
-If the file name contains spaces, then it must be enclosed in 
quotation marks.
-
-
-
-
---pt {Printername} {filename1} {filename2} ...
-
-
-Prints the files {filename1} {filename2} ... to the 
printer {Printername} and ends. The splash screen does not 
appear.
-If the file name 

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8845ccc1d46fe09eae7b37367a6fbc774fd0b7a4
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sun Dec 4 12:30:34 2016 +0200

Updated core
Project: help  47ad5a2f2102740bda4cf02dcd73562da79f67a9

tdf#100836 "Starting the LibreOffice Software With Parameters" help update

rewritten cmdHelp in accordance with the attached document in bug tdf#100836

Change-Id: I6061dab2ed83a2be0653fbbd422e3193386d9d98
Reviewed-on: https://gerrit.libreoffice.org/31595
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index 8941625..47ad5a2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 89416253fdd67a9334660238f2c23f0fdfb3a10e
+Subproject commit 47ad5a2f2102740bda4cf02dcd73562da79f67a9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[tagezi]

 desktop/source/app/cmdlinehelp.cxx |  193 +++--
 1 file changed, 124 insertions(+), 69 deletions(-)

New commits:
commit d78f29ab3f40cfaf8c975005fceba93a193b28e5
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sat Nov 26 20:37:24 2016 +0200

tdf#100836 "Starting the LibreOffice Software With Parameters" help update

rewritten cmdHelp in accordance with the attached document in bug tdf#100836

Change-Id: I6453ee87039272388fe1bc0efd747dc706b570ff
Reviewed-on: https://gerrit.libreoffice.org/31244
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index 122238c..915f060 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -38,75 +38,130 @@ namespace desktop
 "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION %BUILDID\n"
 "\n";
 const char aCmdLineHelp[] =
-"Usage: %CMDNAME [options] [documents...]\n"
-"\n"
-"Options:\n"
-"--minimizedkeep startup bitmap minimized.\n"
-"--invisibleno startup screen, no default document and no UI.\n"
-"--norestoresuppress restart/restore after fatal errors.\n"
-"--quickstart   starts the quickstart service\n"
-"--safe-modestarts the safe mode\n"
-"--nologo   don't show startup screen.\n"
-"--nolockcheck  don't check for remote instances using the 
installation\n"
-"--nodefaultdon't start with an empty document\n"
-"--headless like invisible but no user interaction at all.\n"
-"--help/-h/-?   show this message and exit.\n"
-"--version  display the version information.\n"
-"--writer   create new text document.\n"
-"--calc create new spreadsheet document.\n"
-"--draw create new drawing.\n"
-"--impress  create new presentation.\n"
-"--base create new database.\n"
-"--math create new formula.\n"
-"--global   create new global document.\n"
-"--web  create new HTML document.\n"
-"-o open documents regardless whether they are templates 
or not.\n"
-"-n always open documents as new files (use as 
template).\n"
-"--display \n"
-"  Specify X-Display to use in Unix/X11 versions.\n"
-"-p \n"
-"  print the specified documents on the default printer.\n"
-"--pt  \n"
-"  print the specified documents on the specified printer.\n"
-"--view \n"
-"  open the specified documents in viewer-(readonly-)mode.\n"
-"--show \n"
-"  open the specified presentation and start it immediately\n"
-"--language=\n"
-"  Override the UI language with the given locale\n"
-"  Eg. --language=fr\n"
-"--accept=\n"
-"  Specify an UNO connect-string to create an UNO acceptor through 
which\n"
-"  other programs can connect to access the API\n"
-"--unaccept=\n"
-"  Close an acceptor that was created with 
--accept=\n"
-"  Use --unnaccept=all to close all open acceptors\n"
-"--infilter=[:filter_options]\n"
-"  Force an input filter type if possible\n"
-"  Eg. --infilter=\"Calc Office Open XML\"\n"
-"  --infilter=\"Text (encoded):UTF8,LF,,,\"\n"
-"--convert-to 
output_file_extension[:output_filter_name[:output_filter_options]] [--outdir 
output_dir] files\n"
-"  Batch convert files (implies --headless).\n"
-"  If --outdir is not specified then current working dir is used 
as output_dir.\n"
-"  Eg. --convert-to pdf *.doc\n"
-"  --convert-to pdf:writer_pdf_Export --outdir /home/user 
*.doc\n"
-"  --convert-to \"html:XHTML Writer File:UTF8\" *.doc\n"
-"  --convert-to \"txt:Text (encoded):UTF8\" *.doc\n"
-"--print-to-file [-printer-name printer_name] [--outdir output_dir] 
files\n"
-"  Batch print files to file.\n"
-"  If --outdir is not specified then curre

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

[tagezi]

 desktop/source/app/cmdlineargs.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87a098e3bb72910399473ee0fbe32a70cad9c737
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sat Nov 26 11:07:23 2016 +0200

Remove extra "=" symbol for "--splash-pipe" argument

This argument ignores any parameters since commit
5c22a03320f20ae9ac2c3c16025e7c5e3a7915d5.
It is a part of documenting cmdline.

Change-Id: I9d7f06f692d77379b3d96b741987f83771bd13c2
Reviewed-on: https://gerrit.libreoffice.org/31243
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index 112fa58..443a87a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -329,7 +329,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 {
 m_version = true;
 }
-else if ( oArg.startsWith("splash-pipe=") )
+else if ( oArg.startsWith("splash-pipe") )
 {
 m_splashpipe = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5-3-branch-point'

[tagezi]

Tag 'libreoffice-5-3-branch-point' created by Christian Lohmaier 
 at 2016-11-23 01:00 +

Tag libreoffice-5-3-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYNOokAAoJEPQ0oe+v7q6jGPcP/R/N7R7j19Xa/awifjtNmSOl
DJnb7P3hiDpekkxEXsBiAaO+2p7812GlJPcXssMAjEYTat6bBTlJBqaiiy/9aYzU
ScE0s1jTLTcMaqsXZ8lBjIRLX3uUuUCKvb76aEP5Pjp0g8v+/CioebS9RIrwZHlx
qrz+i+6vqzqkjdRGX4zTEZ7UomLavSw3xcOPHSisDNmZ8DFZVmOOmMmLX6gkXQ2G
cbysKO9H5kwYIPDg2+Vk6HjniuV2HmZ4v1i3968AHTxz1YPhN8bekh85N/ejC53c
AOAzQvGVDLl+ZcOm50aTr6ZPZY6ykRW6jAvY1eh0mYrjeAzvuifBJ3xUXdMH0iRR
A751xHLQoaWvhLk9efpDp9ilS+xbBl1tPE4pX9G+pT4BnsIRI23tdoOMyJcOkfr0
XXBOB/X+KS89qs8A7Fd1xHFyyyFSsS+4zxrq2LWBblQOUwf0lm8YYR6od3Ut6i5H
jMNdbgB200wzlLvFiZV5yXg8eYO/CGXfJ4W0RPuWvt++L+QmQvG7DcgiDmhLDAMG
XuF4MhbaFDAK1yQAc8V1C8vves172UflO2jIvtbbec36I5E+8rqddRWk4ez89wfS
UiF9IKkY4u8gOGfr/S3AM6jvXDCY+gqj1xlBwe7dWFajD4rfZB5YK+w4J2xso+ld
WVSpTMWJpoQpB8Y3UBzp
=BYxF
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-164:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f68340b446c048cdac9b958b1e6e266a5dfeb786
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Nov 18 18:04:10 2016 +0200

Updated core
Project: help  b429143c2cbedbc28b9b8c9cc07cd76cd69b68c6

rewritten page anout protection in Writer

updated way to item of menu
added explanetions
added section about protection of whole document
ubdate formattig
Set 3: reviewed and rewritten
a lot of place have smoll chenges
Change-Id: I79753b4d656cbb0e173bf0372dc195840609c0cd
Reviewed-on: https://gerrit.libreoffice.org/30967
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>

diff --git a/helpcontent2 b/helpcontent2
index e852c87..b429143 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e852c87f0bef8b19c4d733460bb10910a880e769
+Subproject commit b429143c2cbedbc28b9b8c9cc07cd76cd69b68c6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/swriter/guide/protection.xhp |  174 ++-
 1 file changed, 83 insertions(+), 91 deletions(-)

New commits:
commit b429143c2cbedbc28b9b8c9cc07cd76cd69b68c6
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Nov 18 18:04:10 2016 +0200

rewritten page anout protection in Writer

updated way to item of menu
added explanetions
added section about protection of whole document
ubdate formattig
Set 3: reviewed and rewritten
a lot of place have smoll chenges
Change-Id: I79753b4d656cbb0e173bf0372dc195840609c0cd
Reviewed-on: https://gerrit.libreoffice.org/30967
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>

diff --git a/source/text/swriter/guide/protection.xhp 
b/source/text/swriter/guide/protection.xhp
index 7b1ffdd..cdbfbee 100644
--- a/source/text/swriter/guide/protection.xhp
+++ b/source/text/swriter/guide/protection.xhp
@@ -18,7 +18,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 

 
   
@@ -26,96 +25,89 @@
  /text/swriter/guide/protection.xhp
   

-   
-indexes;unprotecting
-  tables of contents;unprotecting
-  tables;protecting/unprotecting cells
-  sections;protecting/unprotecting
-  unprotecting tables of contents and 
indexes
-  protecting;tables and sections
-  cells;protecting/unprotecting
-mw transferred 4 index entries from 
shared/guide/protection.xhp, then changed "sections;" and "tables;", then added 
3 new entries
-Protecting Content in %PRODUCTNAME Writer 
-
-  The following is an overview of the different ways of protecting 
contents in %PRODUCTNAME Writer from being 
modified, deleted or viewed.
-  Protecting Sections in %PRODUCTNAME Writer
-  Any section of a %PRODUCTNAME 
Writer text document can be protected against changes with a 
password.
-  This protection is not intended to be a secure protection. It is 
just a switch to protect the section against accidental changes.
-  
- 
-
-   Turning on protection
-
-
-   Select the text. Choose Insert - 
Section - Section, then under Write protection mark the 
Protect and With password check boxes. (If the 
section already exists: Format - Sections.) Enter and confirm a 
password of at least one character.
-
- 
- 
-
-   Turning off protection
-
-
-   Choose Format - Sections - 
Section and under Write protection clear the 
Protect check box. Enter the correct password.
-
- 
-  
+
+indexes;unprotecting
+tables of contents;unprotecting
+tables;protecting/unprotecting cells
+sections;protecting/unprotecting
+unprotecting tables of contents and 
indexes
+protecting;tables and sections
+cells;protecting/unprotecting
+document;protection from changes
+
+Protecting Content in %PRODUCTNAME Writer
+The 
following is an overview of the different ways of protecting contents in %PRODUCTNAME Writer from being modified or 
deleted.
+Protecting Sections in %PRODUCTNAME 
Writer
+Any 
section of a %PRODUCTNAME Writer text document 
can be protected against changes with or without a password.
+This 
protection is not intended to be a secure protection. It is just a switch to 
protect the section against accidental changes.
+Turning on of protection
+Create or select a section:
+
+If the section does not exist: Select the text. Go to the 
Insert - Section... in menu bar.
+If the section already exists:Go to 
the Format - Sections... in menu bar and select the section.
+Or right-click on the section in the Navigator and choose 
the Edit... item.
+
+Enable a protection
+
+If you want the protection without a password, choose the 
Protect check box under the Write 
protection.
+If you want the protection with a password, choose the the 
Protect and With password check boxes. Enter and 
confirm the password of at least five characters.
+
+Modification of protection
+
+
+If the protection has no a password, and you want to give it, 
choose the With password, enter and confirm the password of at 
least five characters.
+If the protection has a password, and you want only to clear 
it, uncheck the With password under the  Write 
protection and enter the correct password.
+If the protection has a password, and you want only to change 
it, click to the Password button in the Write 
protection, enter the correct password, and in the new window, enter and 
confirm the new password of at least five characters.
+
+Turning off of 
protecti

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/scalc/01/func_aggregate.xhp |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 3856203084068752c3f5868e1f75ca4feb1f45d8
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Nov 11 17:36:52 2016 +0200

small refinements and cosmetic changes

corrected mistakes in the examples
pushed back signs of equality from numbers
made refinements  warning of error

Change-Id: I07194c563cf22d5b1b8254f77579f12461362a15
Reviewed-on: https://gerrit.libreoffice.org/30782
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/source/text/scalc/01/func_aggregate.xhp 
b/source/text/scalc/01/func_aggregate.xhp
index 2520607..c934650 100644
--- a/source/text/scalc/01/func_aggregate.xhp
+++ b/source/text/scalc/01/func_aggregate.xhp
@@ -277,11 +277,11 @@
 
 
 Ref1 – obligatory argument. The first numeric 
argument (if the range is set by a list of values inside the function) or a 
reference to a cell that contains it. 
-Ref2,3,... – optional. A numeric argument or a 
reference to a cell (up to 253 arguments), for which you need the aggregate 
value.
+Ref2, 3, ... – optional. A numeric argument or 
a reference to a cell (up to 253 arguments), for which you need the aggregate 
value.
 Array – obligatory argument. The array can be 
specified by the boundaries of the range, the name of the named range or the 
column label.
 For using 
column labels “Automatically find columns and rows labels” function needs 
to be enabled.
 k – obligatory argument for the following 
functions: LARGE, SMALL, PERCENTILE.INC, QUARTILE.INC, PERCENTILE.EXC, 
QUARTILE.EXC. It is a numeric argument, which must correspond to the second 
argument of these functions.
-If the 
second argument is necessary, but not specified, the function returns the error 
Err:511.If the second argument specified not correctly, the function 
returns the error Err:502.
+If the 
k argument is necessary, but not specified, the function returns 
the error Err:511.If the Function and/or Option 
arguments specified not correctly, the function returns the error 
Err:502.
 
 Examples
 
@@ -427,13 +427,13 @@
   
 
 
-=AGGREGATE(4;2;A2:A9)Returns maximum value for the 
range A2:A9 =34, whereas =MAX(A2:A9) returns the 
error Err:511.
-=AGGREGATE(9;5;A5:C5)Returns sum for the range A5:C5 
=29, even if some of the columns are hidden.
-=AGGREGATE(9;5;B2:B9)Returns sum of the column B =115. 
If any row is hidden, the function omit its value, for example if the 7th row 
is hidden, the function returns 95.
-If you 
need to apply the function with a 3-D range, this example shows how to do 
it.
-=AGGREGATE(13;3;Sheet1.B2:B9:Sheet3.B2:B9)The function 
returns mode of the values of second columns through sheets 1:3 (that have the 
same data) =8.
+=AGGREGATE(4;2;A2:A9)Returns maximum value for the 
range A2:A9 = 34, whereas =MAX(A2:A9) returns the 
error Err:511.
+=AGGREGATE(9;5;A5:C5)Returns sum for the range A5:C5 = 
29, even if some of the columns are hidden.
+=AGGREGATE(9;5;B2:B9)Returns sum of the column B = 
115. If any row is hidden, the function omit its value, for example if the 7th 
row is hidden, the function returns 95.
+If you 
need to apply the function with a 3D range, this example shows how to do 
it.
+=AGGREGATE(13;3;Sheet1.B2:B9:Sheet3.B2:B9)The function 
returns mode of the values of second columns through sheets 1:3 (that have the 
same data) = 8.
 You 
can use reference to a cell or a range for every argument in the formula. The 
following example shows how it works. Besides, it shows that you can use column 
labels to specify an array.
-=AGGREGATE(E3;E5;'ColumnOne')If E5 =13 and E7 =5, the 
function returns mode of the first column =10.
+=AGGREGATE(E3;E5;'ColumnOne')If E3 = 13 and E5 = 5, 
the function returns mode of the first column = 10.
 
 
 AVERAGE, COUNT, COUNTA, MAX, MIN, PRODUCT, STDEV.S, STDEV.P, SUM, VAR.S, VAR.P, MEDIAN, MODE.SNGL, LARGE, SMALL
 , PERCENTILE.INC , QUARTILE.INC, PERCENTILE.EXC, QUARTILE.EXC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a615d93fa583eacc30b1ac38eba692ad009e8863
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Nov 11 17:36:52 2016 +0200

Updated core
Project: help  3856203084068752c3f5868e1f75ca4feb1f45d8

small refinements and cosmetic changes

corrected mistakes in the examples
pushed back signs of equality from numbers
made refinements  warning of error

Change-Id: I07194c563cf22d5b1b8254f77579f12461362a15
Reviewed-on: https://gerrit.libreoffice.org/30782
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index 383f9c4..3856203 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 383f9c4105ba03f86aa722b4881e7f690e017baa
+Subproject commit 3856203084068752c3f5868e1f75ca4feb1f45d8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ee9cfecf1800394881f5015199cd6e4af14bc92
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sun Nov 29 12:50:35 2015 +0200

Updated core
Project: help  7e8d97ebb560b267f1e60c5f8c367660d0629a6b

tdf#95542 proofreading text of the Parameter queries chapter

the patch is offered Peter Toye in tdf#95542
rewritten chapters Parameter queries and Parametr Input
additional changes
added tags item
replaced comments with links
replaced the role of the par_id191120151905584287 paragraph
with warning

Change-Id: I9aa52395fb2dbf416478ab925695928e6fdb715b
Reviewed-on: https://gerrit.libreoffice.org/20269
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index 5811bc0..7e8d97e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5811bc0774c5024fad57f5de60bb0b4201bedb04
+Subproject commit 7e8d97ebb560b267f1e60c5f8c367660d0629a6b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/shared/explorer/database/02010100.xhp | 1504 +++---
 1 file changed, 782 insertions(+), 722 deletions(-)

New commits:
commit 7e8d97ebb560b267f1e60c5f8c367660d0629a6b
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sun Nov 29 12:50:35 2015 +0200

tdf#95542 proofreading text of the Parameter queries chapter

the patch is offered Peter Toye in tdf#95542
rewritten chapters Parameter queries and Parametr Input
additional changes
added tags item
replaced comments with links
replaced the role of the par_id191120151905584287 paragraph
with warning

Change-Id: I9aa52395fb2dbf416478ab925695928e6fdb715b
Reviewed-on: https://gerrit.libreoffice.org/20269
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/source/text/shared/explorer/database/02010100.xhp 
b/source/text/shared/explorer/database/02010100.xhp
index e38349c..bef723e 100644
--- a/source/text/shared/explorer/database/02010100.xhp
+++ b/source/text/shared/explorer/database/02010100.xhp
@@ -1,7 +1,5 @@
 
-
-
-
+
 
-
+-->
 
-   
 
-
-Query Design
-/text/shared/explorer/database/02010100.xhp
-
+  
+Query Design
+/text/shared/explorer/database/02010100.xhp
+  
 
+
 
-views; creating database views 
(Base)
-queries; creating in design view (Base)
-designing; queries (Base)
-design view; queries/views (Base)
-joining;tables (Base)
-tables in databases; joining for queries 
(Base)
-queries; joining tables (Base)
-tables in databases; relations (Base)
-relations; joining tables (Base)
-queries; deleting table links (Base)
-criteria of query design (Base)
-queries; formulating filter conditions (Base)
-filter conditions;in queries (Base)
-parameters; queries (Base)
-queries; parameter queries (Base)
-SQL; queries (Base)
-native SQL (Base)
-mw added "(Base)" to all entries
-Query Design
-The Query Design View allows you to 
create and edit a database query.
+
+
+  views; creating database views (Base)
+  queries; creating in design view (Base)
+  designing; queries (Base)
+  design view; queries/views (Base)
+  joining;tables (Base)
+  tables in databases; joining for queries 
(Base)
+  queries; joining tables (Base)
+  tables in databases; relations (Base)
+  relations; joining tables (Base)
+  queries; deleting table links (Base)
+  criteria of query design (Base)
+  queries; formulating filter conditions 
(Base)
+  filter conditions;in queries (Base)
+  parameters; queries (Base)
+  queries; parameter queries (Base)
+  SQL; queries (Base)
+  native SQL (Base)
+
+mw added "(Base)" to all entries
+
+
+Query 
Design
+The Query Design View allows you to create and edit a 
database query.
+
 
 
 
-Most 
databases use queries to filter or to sort database tables to display records 
on your computer. Views offer the same functionality as queries, but on the 
server side. If your database is on a server that supports views, you can use 
views to filter the records on the server to speed up the display 
time.
-Selecting the Create View command from the 
Tables tab page of a database document, you see the View 
Design window that resembles the Query Design window 
described here.
-The 
Query Design window layout is stored with a created query, but cannot be stored 
with a created view.
-The Design View
-To create a query, click the Queries icon in a database 
document, then click Create Query in Design View.
-The lower pane of the Design View is where you define 
the query. To define a query, specify the database field 
names to include and the criteria for displaying the fields. To rearrange the 
columns in the lower pane of the Design View, drag a column header to a new 
location, or select the column and press CommandCtrl+arrow
 key.
-In the top of the query Design View window, the icons of the Query 
Design Bar and the Design bar are displayed.
-If you want to test a query, double-click the query name in the 
database document. The query result is displayed in a table similar to the Data 
Source View. Note: the table displayed is only temporary.
-Keys in Query Design View
+Most databases use 
queries to filter or to sort database tables to display records on your 
computer. Views offer the same functionality as queries, but on the server 
side. If your database is on a server that supports views, you can use views to 
filter the records on the server to speed up the display time.
+Selecting the 
Create View command from the Tables tab page of a 
database document, you see the View Design window that resembles 
the Query Design window described here.
+The Query 
Design window layout is stored with a created query, but cannot be stored with 
a created view.
+
+The 
Design View
+To create a 
query, click the Queries icon in a database document, then click 
Create Query in Design View.
+The lower pane 
of the Design View is where you defi

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/swriter/guide/protection.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e76de4d2ed263ec64b9aeba984c4830cd23a93a9
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Nov 20 03:36:36 2015 +0200

changed place a attribute localize="false"

the attribute localize="false" can not located in a tag embedvar.
moved in the paragraph
see OOo2HelpAuthoring.pdf, page 47

Change-Id: I56202e0cdddaed49c277fa882df96c80f3f6957d
Reviewed-on: https://gerrit.libreoffice.org/20069
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/source/text/swriter/guide/protection.xhp 
b/source/text/swriter/guide/protection.xhp
index e012094..eb4d81a 100644
--- a/source/text/swriter/guide/protection.xhp
+++ b/source/text/swriter/guide/protection.xhp
@@ -113,8 +113,8 @@
   
   
   
-  
- 
+  
+ 
   
   Protecting Other 
Contents

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd748e1d32d1798a3495e62b9d103f5d7435a223
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Nov 20 03:36:36 2015 +0200

Updated core
Project: help  e76de4d2ed263ec64b9aeba984c4830cd23a93a9

changed place a attribute localize="false"

the attribute localize="false" can not located in a tag embedvar.
moved in the paragraph
see OOo2HelpAuthoring.pdf, page 47

Change-Id: I56202e0cdddaed49c277fa882df96c80f3f6957d
Reviewed-on: https://gerrit.libreoffice.org/20069
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/helpcontent2 b/helpcontent2
index edbe20e..e76de4d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit edbe20e99a83dee43ab75f584c391121bd65d829
+Subproject commit e76de4d2ed263ec64b9aeba984c4830cd23a93a9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/scalc/01/ful_func.xhp|   12 ++--
 source/text/scalc/01/func_imcos.xhp  |6 +++---
 source/text/scalc/01/func_imcosh.xhp |6 +++---
 source/text/scalc/01/func_imcot.xhp  |6 +++---
 source/text/scalc/01/func_imcsc.xhp  |6 +++---
 source/text/scalc/01/func_imcsch.xhp |6 +++---
 source/text/scalc/01/func_imsec.xhp  |6 +++---
 source/text/scalc/01/func_imsech.xhp |6 +++---
 source/text/scalc/01/func_imsin.xhp  |6 +++---
 source/text/scalc/01/func_imsinh.xhp |6 +++---
 source/text/scalc/01/func_imtan.xhp  |6 +++---
 11 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit c3b9e2711f3670e3a9f5fdf7abb7e4dca8ea1f2b
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 9 14:45:22 2015 +0200

tdf#95698 correction a parent tag for paragraphs

ful_func.xhp -- changed the parent tag from 'variable' to 'section'
for paragraphs

func_im* -- canged corresponding links form embedvar to embed

Change-Id: If150119308bd5ce93a74dee83f1280810a8c5fee
Reviewed-on: https://gerrit.libreoffice.org/19859
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/source/text/scalc/01/ful_func.xhp 
b/source/text/scalc/01/ful_func.xhp
index 4835f40..b6ff653 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -15,16 +15,16 @@
 
 
 Title in descriptions of functions 
-   
+   

Syntax

-   
-   
+   
+   

Examples

-   
+   

 Notes for functions 

@@ -61,10 +61,10 @@
The imaginary part is equal to zero, so it is not 
displayed in the result.


-   
+   

The result is presented in the string format and has 
the character "i" or "j" as an imaginary unit.

-   
+   
 
 
diff --git a/source/text/scalc/01/func_imcos.xhp 
b/source/text/scalc/01/func_imcos.xhp
index 9e0b221..1e49165 100644
--- a/source/text/scalc/01/func_imcos.xhp
+++ b/source/text/scalc/01/func_imcos.xhp
@@ -34,9 +34,9 @@

cos(a+bi) = cos(a)cosh(b) - sin(a)sinh(b)i
 
-   
+   

-   
+   

IMCOS(Complex_number)

@@ -51,7 +51,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imcosh.xhp 
b/source/text/scalc/01/func_imcosh.xhp
index f93b09b..de6c9b7 100644
--- a/source/text/scalc/01/func_imcosh.xhp
+++ b/source/text/scalc/01/func_imcosh.xhp
@@ -34,9 +34,9 @@

cosh(a+bi)=cosh(a)cos(b)+sinh(a)sin(b)i

-   
+   

-   
+   

IMCOSH(Complex_number)

@@ -51,7 +51,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imcot.xhp 
b/source/text/scalc/01/func_imcot.xhp
index 7993741..7a35940 100644
--- a/source/text/scalc/01/func_imcot.xhp
+++ b/source/text/scalc/01/func_imcot.xhp
@@ -38,9 +38,9 @@



-   
+   

-   
+   

IMCOT(Complex_number)

@@ -55,7 +55,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imcsc.xhp 
b/source/text/scalc/01/func_imcsc.xhp
index 7285d50..24bdfdc 100644
--- a/source/text/scalc/01/func_imcsc.xhp
+++ b/source/text/scalc/01/func_imcsc.xhp
@@ -38,9 +38,9 @@



-   
+   

-   
+   

IMCSC(Complex_number)

@@ -55,7 +55,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imcsch.xhp 
b/source/text/scalc/01/func_imcsch.xhp
index 4b054a5..f543812 100644
--- a/source/text/scalc/01/func_imcsch.xhp
+++ b/source/text/scalc/01/func_imcsch.xhp
@@ -38,9 +38,9 @@



-   
+   

-   
+   

IMCSCH(Complex_number)

@@ -55,7 +55,7 @@



-   
+   


=("4-3i")
diff --git a/source/text/scalc/01/func_imsec.xhp 
b/source/text/scalc/01/func_imsec.xhp
index ca9b031..e614a7d 100644
--- a/sour

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96a6b7bb1a073b6d2a5c01712b2c9a818c53c77a
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 9 14:45:22 2015 +0200

Updated core
Project: help  c3b9e2711f3670e3a9f5fdf7abb7e4dca8ea1f2b

tdf#95698 correction a parent tag for paragraphs

ful_func.xhp -- changed the parent tag from 'variable' to 'section'
for paragraphs

func_im* -- canged corresponding links form embedvar to embed

Change-Id: If150119308bd5ce93a74dee83f1280810a8c5fee
Reviewed-on: https://gerrit.libreoffice.org/19859
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 886917b..c3b9e27 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 886917bcac6656b66f78c84c57cc30822008
+Subproject commit c3b9e2711f3670e3a9f5fdf7abb7e4dca8ea1f2b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/scalc/01/04060102.xhp |   96 +++---
 source/text/scalc/01/04060103.xhp |2 
 source/text/scalc/01/04060105.xhp |2 
 source/text/scalc/01/04060107.xhp |   76 +++---
 source/text/scalc/01/04060109.xhp |4 -
 source/text/scalc/01/04060118.xhp |   16 +++---
 source/text/scalc/01/04060119.xhp |8 +--
 source/text/scalc/01/04060181.xhp |8 +--
 source/text/scalc/01/05080300.xhp |4 -
 source/text/scalc/01/0512.xhp |2 
 10 files changed, 109 insertions(+), 109 deletions(-)

New commits:
commit b645686c03bd35e7b0fb413af3f94301f7ce8dca
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 2 22:34:50 2015 +0200

added the attribute localize="false" for scalc

added the attribute localize="false" in paragraphs for the scalc module
 which does not need translation

Change-Id: I570449bfed68368a77ebbfcbd641eaffeff7d57d
Reviewed-on: https://gerrit.libreoffice.org/19747
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/source/text/scalc/01/04060102.xhp 
b/source/text/scalc/01/04060102.xhp
index 2d1ee1e..db41ffd 100644
--- a/source/text/scalc/01/04060102.xhp
+++ b/source/text/scalc/01/04060102.xhp
@@ -86,123 +86,123 @@
 Functions
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
-
-
+
+   
 
 
 
diff --git a/source/text/scalc/01/04060103.xhp 
b/source/text/scalc/01/04060103.xhp
index c72a05e..7c3618a 100644
--- a/source/text/scalc/01/04060103.xhp
+++ b/source/text/scalc/01/04060103.xhp
@@ -192,7 +192,7 @@
 FV (optional) defines the future value remaining 
after the final installment has been made.
  
 Type (optional) denotes due date for payments. Type = 
1 means due at the beginning of a period and Type = 0 (default) means due at 
the end of the period.
- 
+ 
 
  
  ThenValue (optional) is the value that is returned if 
the logical test is TRUE.
  
 OtherwiseValue (optional) is the value that is 
returned if the logical test is FALSE.
- 
+ 
 
  
  Without deselecting the range, select the MUNIT function. Mark the 
Array check box. Enter the desired dimensions for the array unit, 
in this case 5, and click OK.
 You can also enter the =Munit(5) formula 
in the last cell of the selected range (E5), and press Shift+Command+EnterShift+Ctrl+Enter.
 You now see a unit array with a range of A1:E5.
-
-
+
+   
 
 
 
@@ -570,8 +570,8 @@
 
 
 Select a single column range in which to enter the frequency 
according to the class limits. You must select one field more than the class 
ceiling. In this example, select the range C1:C6. Call up the FREQUENCY 
function in the Function Wizard. Select the Data 
range in (A1:A11), and then the Classes range in which you entered 
the class limits (B1:B6). Select the Array check box and click 
OK. You will see the frequency count in the range 
C1:C6.
-
-
+
+   
 
 
 
@@ -586,8 +586,8 @@
 
 Array represents a square array in which the determinants are 
defined.
 You can 
find a general introduction to using Array functions on top of this 
page.
-
-
+
+   
 
 
 
@@ -601,8 +601,8 @@
 MINVERSE(Array)
 
 Array represents a square array that is to be 
inverted.
-
-
+
+   
 
 Example
 Select a square range and select MINVERSE. Select the output array, 
select the Array field and click OK.
@@ -619,8 +619,8 @@
 Array at first place represents the first array used in the array 
product.
 
 Array at second place represents the second array with the same 
number of rows.
-
-
+
+   
 
 Example
 Select a square range. Choose the MMULT function. Select the first 
Array, then select the second Array. Using 
Function Wizard, mark the Array check box. Click 
OK. The output array will appear in the first selected 
range.
@@ -635,8 +635,8 @@
 TRANSPOSE(Array)
 
 Array represents the array in the spreadsheet that is to be 
transposed.
-
-
+
+   
 
 Example
 In the spreadsheet, select the range in which the transposed array 
can appear. If the original array has n rows and m columns, your selected range 
must have at least m rows and n columns. Then enter the formula directly, 
select the original array and press Shift+Command+EnterShift+Ctrl+Enter.
 Or, if you are using the Function Wizard, mark the 
Array check box. The transposed array appears in the selected 
targe

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1ac4560a407cee3d6661939bb3b947e5d92946b7
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 2 22:34:50 2015 +0200

Updated core
Project: help  b645686c03bd35e7b0fb413af3f94301f7ce8dca

added the attribute localize="false" for scalc

added the attribute localize="false" in paragraphs for the scalc module
 which does not need translation

Change-Id: I570449bfed68368a77ebbfcbd641eaffeff7d57d
Reviewed-on: https://gerrit.libreoffice.org/19747
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/helpcontent2 b/helpcontent2
index 43d4ce5..b645686 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 43d4ce55e9acea598a4572bdc7959522accf
+Subproject commit b645686c03bd35e7b0fb413af3f94301f7ce8dca
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a17cfe9de14d83c28cae142a64782387dcaa4864
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 2 22:26:00 2015 +0200

Updated core
Project: help  26baeac2ca9254e6adf82b174943e2c2e9d5b2db

added the attribute localize="false" for simpress and swriter

added the attribute localize="false" in paragraphs for simpress
and swriter modules which does not need translation

Change-Id: Ice6556863c4e816b5b2cb3bd279011c0b9c9e889
Reviewed-on: https://gerrit.libreoffice.org/19746
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/helpcontent2 b/helpcontent2
index 315ee49..26baeac 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 315ee49055a14877fc040238050d4a4ff106fb03
+Subproject commit 26baeac2ca9254e6adf82b174943e2c2e9d5b2db
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/simpress/01/03152000.xhp  |8 
 source/text/simpress/01/effectoptions.xhp |   12 ++--
 source/text/simpress/01/taskpanel.xhp |4 ++--
 source/text/swriter/guide/pagestyles.xhp  |4 ++--
 source/text/swriter/guide/protection.xhp  |2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 26baeac2ca9254e6adf82b174943e2c2e9d5b2db
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 2 22:26:00 2015 +0200

added the attribute localize="false" for simpress and swriter

added the attribute localize="false" in paragraphs for simpress
and swriter modules which does not need translation

Change-Id: Ice6556863c4e816b5b2cb3bd279011c0b9c9e889
Reviewed-on: https://gerrit.libreoffice.org/19746
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/source/text/simpress/01/03152000.xhp 
b/source/text/simpress/01/03152000.xhp
index 3f17d45..cf5fa5a 100644
--- a/source/text/simpress/01/03152000.xhp
+++ b/source/text/simpress/01/03152000.xhp
@@ -54,11 +54,11 @@
 Notes and Handouts tab page where you can specify options for the 
notes pages and the handout pages.
 
 
-
-
+
+   
 
-
-
+
+   
 
 Include on slide
 Specify the elements to include on your slides.
diff --git a/source/text/simpress/01/effectoptions.xhp 
b/source/text/simpress/01/effectoptions.xhp
index 7f8528f..0a2d932 100644
--- a/source/text/simpress/01/effectoptions.xhp
+++ b/source/text/simpress/01/effectoptions.xhp
@@ -33,14 +33,14 @@
 Specifies additional properties for the selected 
element in the Custom 
Animations pane.
 Assign an 
effect to an object, then click the ... button to open the Effect 
Options dialog.
 The 
dialog contains the following tab pages:
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
 
 
diff --git a/source/text/simpress/01/taskpanel.xhp 
b/source/text/simpress/01/taskpanel.xhp
index 38d9a50..aae1b5c 100644
--- a/source/text/simpress/01/taskpanel.xhp
+++ b/source/text/simpress/01/taskpanel.xhp
@@ -39,8 +39,8 @@
 
 The 
task pane contains pages to specify the master pages, layouts, custom 
animation, and slide transition. Click another heading to open another 
page.
 
-
-
+
+   
 
 
 Master Page
diff --git a/source/text/swriter/guide/pagestyles.xhp 
b/source/text/swriter/guide/pagestyles.xhp
index e1ea5bc..ceb46d1 100644
--- a/source/text/swriter/guide/pagestyles.xhp
+++ b/source/text/swriter/guide/pagestyles.xhp
@@ -34,10 +34,10 @@
 Creating and Applying Page Styles 
 
   $[officename] uses page styles to specify the layout of a page, 
including the page orientation, background, margins, headers, footers, and text 
columns. To change the layout of an individual page in a document, you must 
create and apply a custom page style to the page.
-  
+  
  
   
-  
+  
  
   
   
   
   
- 
+ 
   
   Protecting Other 
Contents

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/scalc/01/0605.xhp|4 ++--
 source/text/scalc/01/0606.xhp|4 ++--
 source/text/scalc/01/12040300.xhp|4 ++--
 source/text/scalc/01/12090400.xhp|4 ++--
 source/text/scalc/guide/cell_protect.xhp |2 +-
 source/text/shared/01/06130200.xhp   |8 
 source/text/shared/02/12090100.xhp   |4 ++--
 source/text/shared/main0201.xhp  |4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 315ee49055a14877fc040238050d4a4ff106fb03
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 2 22:40:36 2015 +0200

added the attribute localize="false" in paragraphs for shared and scalc

added the attribute localize="false" in paragraphs for shared and scalc
 modules which does not need translation

Change-Id: I622d9032ff6e3bc3415b0012aaac0b29ae8e947c
Reviewed-on: https://gerrit.libreoffice.org/19749
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/source/text/scalc/01/0605.xhp 
b/source/text/scalc/01/0605.xhp
index d4d6c28..964b188 100644
--- a/source/text/scalc/01/0605.xhp
+++ b/source/text/scalc/01/0605.xhp
@@ -40,8 +40,8 @@ dedr: reviewed
 
   
 
-
-
+
+   
 
 
 
diff --git a/source/text/scalc/01/0606.xhp 
b/source/text/scalc/01/0606.xhp
index 30922f7..e0603e2 100644
--- a/source/text/scalc/01/0606.xhp
+++ b/source/text/scalc/01/0606.xhp
@@ -43,8 +43,8 @@
 Documents
 
 
-
-
+
+   
 
 
 
diff --git a/source/text/scalc/01/12040300.xhp 
b/source/text/scalc/01/12040300.xhp
index 695db01..9b9b38a 100644
--- a/source/text/scalc/01/12040300.xhp
+++ b/source/text/scalc/01/12040300.xhp
@@ -35,8 +35,8 @@
 
 
 
-
-
+
+   
 
 
 
diff --git a/source/text/scalc/01/12090400.xhp 
b/source/text/scalc/01/12090400.xhp
index 50728da..e649edc 100644
--- a/source/text/scalc/01/12090400.xhp
+++ b/source/text/scalc/01/12090400.xhp
@@ -51,8 +51,8 @@
 Intervals
 In 
the case of grouping date values, specifies the intervals to group 
by.
 
-
-
+
+   
 
 
 
diff --git a/source/text/scalc/guide/cell_protect.xhp 
b/source/text/scalc/guide/cell_protect.xhp
index 5318931..ef443cd 100644
--- a/source/text/scalc/guide/cell_protect.xhp
+++ b/source/text/scalc/guide/cell_protect.xhp
@@ -77,7 +77,7 @@
   
  
  
- 
+ 
 
  
   
diff --git a/source/text/shared/01/06130200.xhp 
b/source/text/shared/01/06130200.xhp
index 31ec8fc..9b533b2 100644
--- a/source/text/shared/01/06130200.xhp
+++ b/source/text/shared/01/06130200.xhp
@@ -47,14 +47,14 @@
 
 JavaScript
 Opens a dialog where you can organize 
scripts.
-
-
+
+   
 
 
 BeanShell
 Opens a dialog where you can organize 
scripts.
-
-
+
+   
 
 
 
diff --git a/source/text/shared/02/12090100.xhp 
b/source/text/shared/02/12090100.xhp
index d1645fb..9b80d0d 100644
--- a/source/text/shared/02/12090100.xhp
+++ b/source/text/shared/02/12090100.xhp
@@ -36,9 +36,9 @@
   
 
 
-
+   
  
-  
+   
 
 
 Filter criteria
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index 95e19eb..e80a015 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -40,8 +40,8 @@
 
 
 Save As
-
-
+
+   
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21e05271b4fd1a79c2d0a47a67f6ef0c8f3d57b5
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 2 22:40:36 2015 +0200

Updated core
Project: help  315ee49055a14877fc040238050d4a4ff106fb03

added the attribute localize="false" in paragraphs for shared and scalc

added the attribute localize="false" in paragraphs for shared and scalc
 modules which does not need translation

Change-Id: I622d9032ff6e3bc3415b0012aaac0b29ae8e947c
Reviewed-on: https://gerrit.libreoffice.org/19749
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/helpcontent2 b/helpcontent2
index d314ff9..315ee49 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d314ff942ad68104e007cc2637f338917ed4f032
+Subproject commit 315ee49055a14877fc040238050d4a4ff106fb03
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/shared/02/fontwork.xhp|4 +-
 source/text/shared/explorer/database/main.xhp |   44 +-
 source/text/shared/guide/data_im_export.xhp   |8 ++--
 source/text/shared/guide/data_new.xhp |8 ++--
 source/text/shared/guide/data_queries.xhp |8 ++--
 source/text/shared/guide/data_register.xhp|8 ++--
 source/text/shared/guide/data_tables.xhp  |8 ++--
 source/text/shared/guide/data_view.xhp|8 ++--
 source/text/shared/guide/protection.xhp   |6 +--
 source/text/shared/guide/xsltfilter.xhp   |2 -
 10 files changed, 52 insertions(+), 52 deletions(-)

New commits:
commit d314ff942ad68104e007cc2637f338917ed4f032
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 2 22:38:22 2015 +0200

added the attribute localize="false" for shared

added the attribute localize="false" in paragraphs for the shared
module which does not need translation

Change-Id: Id8ff97a33a488c17411162919afa2b46192ab9ca
Reviewed-on: https://gerrit.libreoffice.org/19748
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/source/text/shared/02/fontwork.xhp 
b/source/text/shared/02/fontwork.xhp
index 1ed06e8..99cbb18 100644
--- a/source/text/shared/02/fontwork.xhp
+++ b/source/text/shared/02/fontwork.xhp
@@ -43,8 +43,8 @@
 Fontwork Gallery
 The Fontwork Gallery displays previews of Fontwork 
objects. To insert an object into your document, select the object, and then 
click OK.
 
-
-
+
+   
 
 Fontwork 
toolbar
 
diff --git a/source/text/shared/explorer/database/main.xhp 
b/source/text/shared/explorer/database/main.xhp
index 0b42e46..21feb0e 100644
--- a/source/text/shared/explorer/database/main.xhp
+++ b/source/text/shared/explorer/database/main.xhp
@@ -63,38 +63,38 @@
 
 
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
-
-
+
+   
 
 
 http://wiki.documentfoundation.org/Database;>Wiki page 
about Base
diff --git a/source/text/shared/guide/data_im_export.xhp 
b/source/text/shared/guide/data_im_export.xhp
index f10a7ad..27b18ac 100644
--- a/source/text/shared/guide/data_im_export.xhp
+++ b/source/text/shared/guide/data_im_export.xhp
@@ -88,11 +88,11 @@
 
 On 
Windows systems, you can also use drag-and-drop instead of Copy and Paste. 
Also, for registered databases, you can open the datasource browser (press F4) 
instead of opening the Base window.
 
-
-
+
+   
 
-
-
+
+   
 ufi: removed switches for calc
 
 
diff --git a/source/text/shared/guide/data_new.xhp 
b/source/text/shared/guide/data_new.xhp
index 19158d1..f1c3ada 100644
--- a/source/text/shared/guide/data_new.xhp
+++ b/source/text/shared/guide/data_new.xhp
@@ -47,11 +47,11 @@
 
 
 
-
-
+
+   
 
-
-
+
+   
 
 
 
diff --git a/source/text/shared/guide/data_queries.xhp 
b/source/text/shared/guide/data_queries.xhp
index b1d4904..5ba110b 100644
--- a/source/text/shared/guide/data_queries.xhp
+++ b/source/text/shared/guide/data_queries.xhp
@@ -68,11 +68,11 @@
 
 You 
see the Query Design 
window.
 
-
-
+
+   
 
-
-
+
+   
 
 
 
diff --git a/source/text/shared/guide/data_register.xhp 
b/source/text/shared/guide/data_register.xhp
index 9c1d564..ee11640 100644
--- a/source/text/shared/guide/data_register.xhp
+++ b/source/text/shared/guide/data_register.xhp
@@ -55,11 +55,11 @@
 
 
 
-
-
+
+   
 
-
-
+
+   
 
 
 
diff --git a/source/text/shared/guide/data_tables.xhp 
b/source/text/shared/guide/data_tables.xhp
index 8e5a503..9098582 100644
--- a/source/text/shared/guide/data_tables.xhp
+++ b/source/text/shared/guide/data_tables.xhp
@@ -79,11 +79,11 @@
 
 You 
see the View Design window, which is almost the same as the Query Design 
window.
 
-
-
+
+   
 
-
-
+
+   
 
 
 
diff --git a/source/text/shared/guide/data_view.xhp 
b/source/text/shared/guide/data_view.xhp
index c21a51e..f133c1f 100644
--- a/source/text/shared/guide/data_view.xhp
+++ b/source/text/shared/guide/data_view.xhp
@@ -50,11 +50,11 @@
 
 
 
-
-
+
+   
 
-
-
+
+   
 
 
 
diff --git a/source/text/shared/guide/protection.xhp 
b/source/text/shared/guide/protection.xhp
index c86cc30..0c582c4 100644
--- a/source/text/shared/guide/protection.xhp
+++ b/source/text/shared/guide/protection.xhp
@@ -132,9 +132,9 @@
 removed webdav text, see i71792MW moved "Opening 
Microsoft Office Documents That Are Protected With a Password" to 
shared/guide/ms_import_export_limitations.xhp 
   
   
-  
-
-
+  
+   
+   
   Protecting Content in 
%PRODUCTNAME Writer
   Protecting Cells in 
%PRODUCTNAME Calc

diff --git a/source/text/shared/guide/xsltfilter.xhp 
b/source/text/shared/guide/xsltfilter.xhp
index b894478..023c03a 100644
--- a/source/text/s

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a21cc936236d0d0e1d6993eda50791d191382c96
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Nov 2 22:38:22 2015 +0200

Updated core
Project: help  d314ff942ad68104e007cc2637f338917ed4f032

added the attribute localize="false" for shared

added the attribute localize="false" in paragraphs for the shared
module which does not need translation

Change-Id: Id8ff97a33a488c17411162919afa2b46192ab9ca
Reviewed-on: https://gerrit.libreoffice.org/19748
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/helpcontent2 b/helpcontent2
index b645686..d314ff9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b645686c03bd35e7b0fb413af3f94301f7ce8dca
+Subproject commit d314ff942ad68104e007cc2637f338917ed4f032
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy

[tagezi]

 icon-themes/galaxy/res/helpimg/sc_func_imcot.png  |binary
 icon-themes/galaxy/res/helpimg/sc_func_imcsc.png  |binary
 icon-themes/galaxy/res/helpimg/sc_func_imcsch.png |binary
 icon-themes/galaxy/res/helpimg/sc_func_imsec.png  |binary
 icon-themes/galaxy/res/helpimg/sc_func_imsech.png |binary
 icon-themes/galaxy/res/helpimg/sc_func_imtan.png  |binary
 6 files changed

New commits:
commit 457f8fd4d33053510b0e44d210b7febd2f07a4ff
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Oct 19 22:17:15 2015 +0300

Formulas for descriptions of trigonometric functions IM*

Change-Id: I6ebde5a5de799838775ddcd4fb532397b0dcf18a
Reviewed-on: https://gerrit.libreoffice.org/19428
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/icon-themes/galaxy/res/helpimg/sc_func_imcot.png 
b/icon-themes/galaxy/res/helpimg/sc_func_imcot.png
new file mode 100644
index 000..b3011ed
Binary files /dev/null and b/icon-themes/galaxy/res/helpimg/sc_func_imcot.png 
differ
diff --git a/icon-themes/galaxy/res/helpimg/sc_func_imcsc.png 
b/icon-themes/galaxy/res/helpimg/sc_func_imcsc.png
new file mode 100644
index 000..33ce699
Binary files /dev/null and b/icon-themes/galaxy/res/helpimg/sc_func_imcsc.png 
differ
diff --git a/icon-themes/galaxy/res/helpimg/sc_func_imcsch.png 
b/icon-themes/galaxy/res/helpimg/sc_func_imcsch.png
new file mode 100644
index 000..216ec88
Binary files /dev/null and b/icon-themes/galaxy/res/helpimg/sc_func_imcsch.png 
differ
diff --git a/icon-themes/galaxy/res/helpimg/sc_func_imsec.png 
b/icon-themes/galaxy/res/helpimg/sc_func_imsec.png
new file mode 100644
index 000..8517230
Binary files /dev/null and b/icon-themes/galaxy/res/helpimg/sc_func_imsec.png 
differ
diff --git a/icon-themes/galaxy/res/helpimg/sc_func_imsech.png 
b/icon-themes/galaxy/res/helpimg/sc_func_imsech.png
new file mode 100644
index 000..7a6a6af
Binary files /dev/null and b/icon-themes/galaxy/res/helpimg/sc_func_imsech.png 
differ
diff --git a/icon-themes/galaxy/res/helpimg/sc_func_imtan.png 
b/icon-themes/galaxy/res/helpimg/sc_func_imtan.png
new file mode 100644
index 000..0befcf9
Binary files /dev/null and b/icon-themes/galaxy/res/helpimg/sc_func_imtan.png 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/scalc/01/ful_func.xhp|   25 ++---
 source/text/scalc/01/func_imcos.xhp  |   13 ++---
 source/text/scalc/01/func_imcosh.xhp |   11 +--
 source/text/scalc/01/func_imcot.xhp  |9 -
 source/text/scalc/01/func_imcsc.xhp  |   13 ++---
 source/text/scalc/01/func_imcsch.xhp |9 -
 source/text/scalc/01/func_imsec.xhp  |9 -
 source/text/scalc/01/func_imsech.xhp |9 -
 source/text/scalc/01/func_imsin.xhp  |9 -
 source/text/scalc/01/func_imsinh.xhp |   10 --
 source/text/scalc/01/func_imtan.xhp  |9 -
 11 files changed, 59 insertions(+), 67 deletions(-)

New commits:
commit 9e1f105bcf48f6518a3804ab14db6f5e8a3eaca4
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Oct 26 03:39:48 2015 +0200

minor changes for functions IM*

ful_func.xhp
paragraphs with service information is replaced to comments;
the last mention of a complex number in the variable
func_define_complex is replaced  to a number, as there can
be any a number, not just a complex number;
added the paragraph about result;
func_imcos.xhp and func_imcosh.xhp
deleted attribute locale="false" in paragraphs with examples,
as they need to be translatable;
in all func_im* files
the part of the variable with description took away;
chenged the part with "a+bi" by request Olivier;
added the link to the result;
added tag  in paragraphs with examples, as examples
need to be separated from his descriptions.

Change-Id: I571415de35440ee9227d6e8bc270ed5c69c9e237
Reviewed-on: https://gerrit.libreoffice.org/19599
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/source/text/scalc/01/ful_func.xhp 
b/source/text/scalc/01/ful_func.xhp
index e9c913a..4835f40 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -14,9 +14,7 @@
   
 
 
-   
-   Title in descriptions of functions
-   
+Title in descriptions of functions 


Syntax
@@ -27,9 +25,8 @@
Examples


-   
-   Notes for functions
-   
+   
+Notes for functions 


Complex_number is a complex number that is 
entered in the form "a+bi" or "a+bj", or is the result of a string operation 
with other functions, cell references, or expressed by concatenating () 
other strings, resulting in a string in the form "a+bi" or "a+bj".
@@ -40,9 +37,8 @@
If Complex_number is actually a real 
number (b=0), then it can be either a string expression or a number value.


-   
-   Warnings for functions
-   
+   
+   Warnings for functions 


The function always returns a string representing a 
complex number.
@@ -53,15 +49,22 @@
If the result is a complex number with one of its parts 
(a or b) equal to zero, that part is not displayed.


+   
+Other paragraphs 


-   Complex_number - A string representing a 
complex number, a real number in either string or number format, or a reference 
to a cell containing a complex number
+   Complex_number - A string representing a 
complex number, a real number in either string or number format, or a reference 
to a cell containing a number


-   
+   

The imaginary part is equal to zero, so it is not 
displayed in the result.


+   
+   
+   The result is presented in the string format and has 
the character "i" or "j" as an imaginary unit.
+   
+   
 
 
diff --git a/source/text/scalc/01/func_imcos.xhp 
b/source/text/scalc/01/func_imcos.xhp
index 16e4743..9e0b221 100644
--- a/source/text/scalc/01/func_imcos.xhp
+++ b/source/text/scalc/01/func_imcos.xhp
@@ -27,15 +27,14 @@



-   
-   Returns the cosine of a complex number. The 
cosine of a complex number "a+bi" can be expressed by:
-   
+   Returns the cosine of a 
complex number. The cosine of a complex number can be expressed by:




cos(a+bi) = cos(a)cosh(b) - sin(a)sinh(b)i
 
+   



@@ -53,16 +52,16 @@



-   
+   
 

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 85adff17399701880de5fe4eed16d8ca11b20c82
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Oct 26 03:39:48 2015 +0200

Updated core
Project: help  9e1f105bcf48f6518a3804ab14db6f5e8a3eaca4

minor changes for functions IM*

ful_func.xhp
paragraphs with service information is replaced to comments;
the last mention of a complex number in the variable
func_define_complex is replaced  to a number, as there can
be any a number, not just a complex number;
added the paragraph about result;
func_imcos.xhp and func_imcosh.xhp
deleted attribute locale="false" in paragraphs with examples,
as they need to be translatable;
in all func_im* files
the part of the variable with description took away;
chenged the part with "a+bi" by request Olivier;
added the link to the result;
added tag  in paragraphs with examples, as examples
need to be separated from his descriptions.

Change-Id: I571415de35440ee9227d6e8bc270ed5c69c9e237
Reviewed-on: https://gerrit.libreoffice.org/19599
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index 5d7d8ae..9e1f105 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5d7d8ae940137262e8fd575a2214bf0baf0e9c1f
+Subproject commit 9e1f105bcf48f6518a3804ab14db6f5e8a3eaca4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[tagezi]

 AllLangHelp_scalc.mk |   11 +++
 source/text/scalc/01/04060116.xhp|  110 +--
 source/text/scalc/01/ODFF.xhp|2 
 source/text/scalc/01/ful_func.xhp|   67 +
 source/text/scalc/01/func_imcos.xhp  |   76 
 source/text/scalc/01/func_imcosh.xhp |   76 
 source/text/scalc/01/func_imcot.xhp  |   78 
 source/text/scalc/01/func_imcsc.xhp  |   80 +
 source/text/scalc/01/func_imcsch.xhp |   80 +
 source/text/scalc/01/func_imsec.xhp  |   80 +
 source/text/scalc/01/func_imsech.xhp |   80 +
 source/text/scalc/01/func_imsin.xhp  |   76 
 source/text/scalc/01/func_imsinh.xhp |   77 
 source/text/scalc/01/func_imtan.xhp  |   78 
 14 files changed, 940 insertions(+), 31 deletions(-)

New commits:
commit 5d7d8ae940137262e8fd575a2214bf0baf0e9c1f
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Oct 23 00:59:22 2015 +0300

A description of trigonometric function IM*

In ODFF a phrase was rewrote
in func_imsec.xhp and func_imsinh.xhp typos are corrected
in AllLangHelp_scalc.mk typo is correctedo

Change-Id: Ieecb11deae5a8b1da56cdaadc9f75ef08b211e3c
Reviewed-on: https://gerrit.libreoffice.org/19429
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 09735b8..975c527 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -181,6 +181,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/12120300 \
 helpcontent2/source/text/scalc/01/ex_data_stat_func \
 helpcontent2/source/text/scalc/01/format_graphic \
+helpcontent2/source/text/scalc/01/ful_func \
 helpcontent2/source/text/scalc/01/func_aggregate \
 helpcontent2/source/text/scalc/01/func_averageif \
 helpcontent2/source/text/scalc/01/func_averageifs \
@@ -196,6 +197,16 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_eomonth \
 helpcontent2/source/text/scalc/01/func_error_type \
 helpcontent2/source/text/scalc/01/func_hour \
+helpcontent2/source/text/scalc/01/func_imcot \
+helpcontent2/source/text/scalc/01/func_imcos \
+helpcontent2/source/text/scalc/01/func_imcosh \
+helpcontent2/source/text/scalc/01/func_imcsc \
+helpcontent2/source/text/scalc/01/func_imcsch \
+helpcontent2/source/text/scalc/01/func_imsec \
+helpcontent2/source/text/scalc/01/func_imsech \
+helpcontent2/source/text/scalc/01/func_imsin \
+helpcontent2/source/text/scalc/01/func_imsinh \
+helpcontent2/source/text/scalc/01/func_imtan \
 helpcontent2/source/text/scalc/01/func_minute \
 helpcontent2/source/text/scalc/01/func_month \
 helpcontent2/source/text/scalc/01/func_networkdays \
diff --git a/source/text/scalc/01/04060116.xhp 
b/source/text/scalc/01/04060116.xhp
index 92448cf..0a9872e 100644
--- a/source/text/scalc/01/04060116.xhp
+++ b/source/text/scalc/01/04060116.xhp
@@ -105,21 +105,46 @@
  
 =IMARGUMENT("3+4j") returns 
0.927295.
   
-  
-IMCOS function
-
-
-IMCOS
- The result is the cosine 
of a complex number.
- Syntax
- IMCOS("ComplexNumber")
- 
- Example
- 
-=IMCOS("3+4j") returns -27.03-3.85i 
(rounded).
-  
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
   
 IMDIV function
 
@@ -241,21 +266,46 @@
  
 =IMREAL("1+3j") returns 1.
   
-  
-IMSIN function
-
-
-IMSIN
- The result is the sine of 
a complex number.
- Syntax
- IMSIN("ComplexNumber")
- 
- Example

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e049fc892b57ca4f3013dc8d6d33d3c1a416e3e
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Oct 23 00:59:22 2015 +0300

Updated core
Project: help  5d7d8ae940137262e8fd575a2214bf0baf0e9c1f

A description of trigonometric function IM*

In ODFF a phrase was rewrote
in func_imsec.xhp and func_imsinh.xhp typos are corrected
in AllLangHelp_scalc.mk typo is correctedo

Change-Id: Ieecb11deae5a8b1da56cdaadc9f75ef08b211e3c
Reviewed-on: https://gerrit.libreoffice.org/19429
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index 4b80c47..5d7d8ae 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4b80c476bf665bdafe7f35003df9b42e3f721564
+Subproject commit 5d7d8ae940137262e8fd575a2214bf0baf0e9c1f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/shared/01/0405.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b80c476bf665bdafe7f35003df9b42e3f721564
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Oct 23 08:50:26 2015 +0300

tdf#95262 Mistake in Help instructions for editing Comments in Calc

Change-Id: If1afa9045b258dab664f1c934e055617e7ec18b4
Reviewed-on: https://gerrit.libreoffice.org/19543
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/source/text/shared/01/0405.xhp 
b/source/text/shared/01/0405.xhp
index a6e9d9b..cbb0f10 100644
--- a/source/text/shared/01/0405.xhp
+++ b/source/text/shared/01/0405.xhp
@@ -81,7 +81,7 @@
   Comments in spreadsheets
   When you attach a comment to a cell, a callout appears 
where you can enter your text. A small square in the upper right corner of a 
cell marks the position of a comment. To display the comment permanently, 
right-click the cell, and choose Show Comment.
   To change the object properties of a comment, for example the 
background color, choose Show Comment as above, then right-click 
the comment (do not double-click the text).
-  To edit a shown comment, double-click the comment text. 
To edit a comment that is not shown permanently, right-click in the cell that 
contains the comment, and then choose Insert - Comment. To specify 
the formatting of the comment text, right-click the comment text in edit 
mode.
+  To edit a shown comment, double-click the comment text. 
To edit a comment that is not shown permanently, right-click in the cell that 
contains the comment, and then choose Edit Comment. To specify the 
formatting of the comment text, right-click the comment text in edit 
mode.
   To change the position or size of a comment, drag a border or corner 
of the comment.
   To delete a comment, right-click the cell, then choose Delete 
Comment.
   You can also right-click a comment name in the Navigator window to 
choose some editing commands.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f40241928d5698b9c60c61657ca2a43eb3b0e268
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Oct 23 08:50:26 2015 +0300

Updated core
Project: help  4b80c476bf665bdafe7f35003df9b42e3f721564

tdf#95262 Mistake in Help instructions for editing Comments in Calc

Change-Id: If1afa9045b258dab664f1c934e055617e7ec18b4
Reviewed-on: https://gerrit.libreoffice.org/19543
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index 3397ffc..4b80c47 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3397ffc09895d62067538eafcfef2858f0e42522
+Subproject commit 4b80c476bf665bdafe7f35003df9b42e3f721564
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[tagezi]

 source/text/scalc/01/func_aggregate.xhp |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 3397ffc09895d62067538eafcfef2858f0e42522
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Oct 23 01:10:41 2015 +0300

Correction to licensing of the patch for func_aggregate.xhp

After introducing func_aggregate.xhp using an old version of helpauthoring
extension the wrong license was introduced in the xhp file.
Further corrections in the sequence still left mention of AL
where it should not. This patch removes references to AL licence.

Sequence:
2015-09-29 tagezi tdf#85228 Added description of AGGREGATE function 
21/18821/7

Change-Id: I28036684bf3ca5a942a82c6ec9295e0eb427e36b
Reviewed-on: https://gerrit.libreoffice.org/19535
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/source/text/scalc/01/func_aggregate.xhp 
b/source/text/scalc/01/func_aggregate.xhp
index 4d8e26b..13de972 100644
--- a/source/text/scalc/01/func_aggregate.xhp
+++ b/source/text/scalc/01/func_aggregate.xhp
@@ -6,16 +6,6 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2a7622276035e5882c16f4c7d1d57cd128b9a69
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Oct 23 01:10:41 2015 +0300

Updated core
Project: help  3397ffc09895d62067538eafcfef2858f0e42522

Correction to licensing of the patch for func_aggregate.xhp

After introducing func_aggregate.xhp using an old version of helpauthoring
extension the wrong license was introduced in the xhp file.
Further corrections in the sequence still left mention of AL
where it should not. This patch removes references to AL licence.

Sequence:
2015-09-29 tagezi tdf#85228 Added description of AGGREGATE function 
21/18821/7

Change-Id: I28036684bf3ca5a942a82c6ec9295e0eb427e36b
Reviewed-on: https://gerrit.libreoffice.org/19535
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/helpcontent2 b/helpcontent2
index 3f2b535..3397ffc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3f2b535c2dea86ec6c01d83dc37fbb56d9c4e999
+Subproject commit 3397ffc09895d62067538eafcfef2858f0e42522
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a5fc7c033cdca217d946f354e577a39c87913896
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Oct 12 19:48:10 2015 +0300

Updated core
Project: help  bd002743972148b9a2dca39248e9f0f406c34eea

Added description the ERROR.TYPE function

func_error_type.xhp is NEW and contains the description
   maybe, need to add more good examples
AllLangHelp_scalc.mk added the link to the file
04060109.xhp added the link to name and description on the function

Change-Id: Ic178c3198ffa91bf02dcf611013347ca7814ab30
Reviewed-on: https://gerrit.libreoffice.org/19361
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 0b6f808..bd00274 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0b6f8089829c49f01e35ce7bb11d5e0e0dfc70f2
+Subproject commit bd002743972148b9a2dca39248e9f0f406c34eea
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[tagezi]

 AllLangHelp_scalc.mk |1 
 source/text/scalc/01/04060109.xhp|4 
 source/text/scalc/01/func_error_type.xhp |  129 +++
 3 files changed, 134 insertions(+)

New commits:
commit bd002743972148b9a2dca39248e9f0f406c34eea
Author: tagezi <lera.goncha...@gmail.com>
Date:   Mon Oct 12 19:48:10 2015 +0300

Added description the ERROR.TYPE function

func_error_type.xhp is NEW and contains the description
   maybe, need to add more good examples
AllLangHelp_scalc.mk added the link to the file
04060109.xhp added the link to name and description on the function

Change-Id: Ic178c3198ffa91bf02dcf611013347ca7814ab30
Reviewed-on: https://gerrit.libreoffice.org/19361
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 0c180ca..09735b8 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -194,6 +194,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_eastersunday \
 helpcontent2/source/text/scalc/01/func_edate \
 helpcontent2/source/text/scalc/01/func_eomonth \
+helpcontent2/source/text/scalc/01/func_error_type \
 helpcontent2/source/text/scalc/01/func_hour \
 helpcontent2/source/text/scalc/01/func_minute \
 helpcontent2/source/text/scalc/01/func_month \
diff --git a/source/text/scalc/01/04060109.xhp 
b/source/text/scalc/01/04060109.xhp
index 0abddba..aab9735 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -178,6 +178,10 @@
 oldref="44">Example
  If cell A1 displays Err:518, the function =ERRORTYPE(A1) returns the number 518.
   
+
+
+
+
   
 INDEX function
 
diff --git a/source/text/scalc/01/func_error_type.xhp 
b/source/text/scalc/01/func_error_type.xhp
new file mode 100644
index 000..4933739
--- /dev/null
+++ b/source/text/scalc/01/func_error_type.xhp
@@ -0,0 +1,129 @@
+
+
+
+
+
+  
+ERROR.TYPE function
+text/scalc/01/func_error_type.xhp
+  
+
+
+
+
+
+
+
+  ERROR.TYPE function
+  index of the Error type
+
+
+ERROR.TYPE 
function
+Returns a number representing a specific 
Error type, or the error value #N/A, if there is no error. 

+
+
+Syntax
+ERROR.TYPE(Error_value)
+Error_value – required argument. The error 
value or a reference to a cell, whose value needs to be processed.
+
+
+  
+
+  Error value
+
+
+  Returns
+
+  
+  
+
+  Err:511
+
+
+  1
+
+  
+  
+
+  #DIV/0!
+
+
+  2
+
+  
+  
+
+  #VALUE!
+
+
+  3
+
+  
+  
+
+  #REF!
+
+
+  4
+
+  
+  
+
+  #NAME?
+
+
+  5
+
+  
+  
+
+  #NUM!
+
+
+  6
+
+  
+  
+
+  #N/A
+
+
+  7
+
+  
+  
+
+  Anything else
+
+
+  #N/A
+
+  
+
+
+
+Examples
+Simple usage
+=ERROR.TYPE(#N/A)
+Returns 7, because 7 is the index number of the error value 
#N/A.
+=ERROR.TYPE(A3)
+If A3 
contains an expression equivavlent to the division by zero, the function 
returns 2, because 2 is the index number of the error value #DIV/0!
+More advanced way
+If in 
division A1 by A2, A2 can turn to zero, you can handle the situation as 
follows:
+=IF(ISERROR(A1/A2);IF(ERROR.TYPE(A1/A2)=2;"the denominator can't 
be equal to zero");A1/A2)
+The 
ISERROR function returns TRUE or FALSE depending on whether there is an error 
or not. If the error takes place, the function IF addresses to the second 
argument, if there is no error, it returns the result of the division. The 
second argument checks the index number representing the specific Error type, 
and if it is equal to 2, it returns the specified text "the denominator can't 
be zero" or 0 otherwise. Thus, clear text would signify the division by zero, 
the result of the division would appear when the division is successful, or if 
there is, for example, an error of another type, zero would be 
returned.
+If the 
ERROR.TYPE function is used as condition of the IF function and the ERROR.TYPE 
returns #N/A, the IF function returns #N/A as well. Use ISERROR to avoid it as 
shown in the example above.
+
+ISERROR, NA, IF
+Error codes
+
+
+
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[tagezi]

 AllLangHelp_scalc.mk |1 
 source/text/scalc/01/04060181.xhp|4 +
 source/text/scalc/01/func_averageifs.xhp |4 -
 source/text/scalc/01/func_countifs.xhp   |   65 +++
 source/text/scalc/01/func_sumifs.xhp |4 -
 5 files changed, 74 insertions(+), 4 deletions(-)

New commits:
commit 0b6f8089829c49f01e35ce7bb11d5e0e0dfc70f2
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Oct 9 23:54:35 2015 +0300

Added description COUNTIFS function

func_countifs.xhp is new
In func_averageifs.xhp and func_averageifs.xhp: added the link to COUNTIFS
corrected some typos

Change-Id: I2f9980d331bac807b1e1e03af24b5660c0081118
Reviewed-on: https://gerrit.libreoffice.org/19288
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 6395e91..0c180ca 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -184,6 +184,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_aggregate \
 helpcontent2/source/text/scalc/01/func_averageif \
 helpcontent2/source/text/scalc/01/func_averageifs \
+helpcontent2/source/text/scalc/01/func_countifs \
 helpcontent2/source/text/scalc/01/func_date \
 helpcontent2/source/text/scalc/01/func_datedif \
 helpcontent2/source/text/scalc/01/func_datevalue \
diff --git a/source/text/scalc/01/04060181.xhp 
b/source/text/scalc/01/04060181.xhp
index 56f748e..53bbbfb 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -131,6 +131,10 @@ oldref="547">COUNTIF
 To count only 
negative numbers: =COUNTIF(A1:A10;"0")
 
 
+
+
+
+
   
 B 
function
  probabilities of samples with binomial 
distribution
diff --git a/source/text/scalc/01/func_averageifs.xhp 
b/source/text/scalc/01/func_averageifs.xhp
index bc450f0..6fb9092 100644
--- a/source/text/scalc/01/func_averageifs.xhp
+++ b/source/text/scalc/01/func_averageifs.xhp
@@ -30,7 +30,7 @@
 AVERAGEIFS(Average_range; Criterion_range1; Criterion1 [; 
Criterion_range2; Criterion2 [; ...]])
 Average_range – required argument. It is a 
range of cells, a name of a named range or a label of a column or a row 
containing values for calculating the mean.
 Criterion_range1 – required argument. It is a 
range of cells, a name of a named range or a label of a column or a row 
containing values for finding the corresponding criterion.
-Criterion1 – required argument. A condition in 
the form of expression or cell reference with expression that defines what 
cells should be used to calculate the mean. The expression can contain text, 
numbers or regular expressions. 
+Criterion1 – required argument. A condition in 
the form of expression or a cell reference to expression that defines what 
cells should be used to calculate the mean. The expression can contain text, 
numbers or regular expressions. 
 Criterion_range2 – Optional. Criterion_range2 
and all the following mean the same as Criterion_range1.
 Criterion2 – Optional. Criterion2 and all the 
following mean the same as Criterion1.
 The logical 
relation between criteria can be defined as logical AND (conjunction). In other 
words, if and only if all given criteria are met, a value from the 
corresponding cell of the given Average_range is taken into calculation of the 
mean.
@@ -58,7 +58,7 @@ If the range of values for calculating the mean and any range 
for finding criter
 =AVERAGEIFS(C2:C6;A2:A6;E2".*";B2:B6;""MAX(B2:B6))
 If E2 = 
pen, the function returns 65, because the link to the cell is substituted with 
its content.
 
-AVERAGE, AVERAGEA, , , MAX, MIN
+AVERAGE, AVERAGEA, , ,  MAX, MIN
 
 
 
diff --git a/source/text/scalc/01/func_countifs.xhp 
b/source/text/scalc/01/func_countifs.xhp
new file mode 100644
index 000..faa7a0b
--- /dev/null
+++ b/source/text/scalc/01/func_countifs.xhp
@@ -0,0 +1,65 @@
+
+
+
+
+
+  
+COUNTIFS function
+text/scalc/01/func_countifs.xhp
+  
+
+
+
+
+
+
+  COUNTIFS function
+  counting row;satisfying criteria
+  counting column;satisfying criteria
+
+COUNTIFS 
function
+Returns the count of rows or columns that 
meet criteria in multiple ranges.
+
+Syntax
+COUNTIFS(Range1; Criterion1 [; Range2; Criterion2 [; 
...]])
+Range1 – required argument. It is a range of 
cells, a name of a named range or a label of a column or a row containing 
values for counting and finding the corresponding criterion.
+Criterion1 – required argument. A condition in 
the form of expression or a cell reference to expression that defines what 
cells should be used for counting. The expression can contain text, numbers or 
regular expressions. 
+Criterion_range2 – Optional. Criterion_range2 
and all the following mean the same as Criterion_range1.
+Criterion2 – Optional. 

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8dc648d0f32e94fe283e2d635f236012491819ca
Author: tagezi <lera.goncha...@gmail.com>
Date:   Fri Oct 9 23:54:35 2015 +0300

Updated core
Project: help  0b6f8089829c49f01e35ce7bb11d5e0e0dfc70f2

Added description COUNTIFS function

func_countifs.xhp is new
In func_averageifs.xhp and func_averageifs.xhp: added the link to COUNTIFS
corrected some typos

Change-Id: I2f9980d331bac807b1e1e03af24b5660c0081118
Reviewed-on: https://gerrit.libreoffice.org/19288
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index a52136a..0b6f808 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a52136a62f56c0ed327eeaa547098134a4f2fca8
+Subproject commit 0b6f8089829c49f01e35ce7bb11d5e0e0dfc70f2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[tagezi]

 AllLangHelp_scalc.mk |1 
 source/text/scalc/01/04060184.xhp|4 +
 source/text/scalc/01/func_averageif.xhp  |   40 +--
 source/text/scalc/01/func_averageifs.xhp |   64 +++
 4 files changed, 89 insertions(+), 20 deletions(-)

New commits:
commit 27b584d0126fce1c74b6f89d3ce766ea46fa622c
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue Oct 6 23:41:14 2015 +0300

Added discription AVERAGEIFS

func_averageif.xhp - corrected typos
added ODF 1.2
added the link to AVERAGEIFS
UPD1 added the function in the 04060184.xhp file
UPD2 Changed in accordance with the comment of Olivier (08.10 12:47 AM)
UPD3 corrected some typos

Change-Id: I659991e24418f5328780ca67eef5d3e939e22e7d
Reviewed-on: https://gerrit.libreoffice.org/19236
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 8ecad3e..96f873a 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -183,6 +183,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/format_graphic \
 helpcontent2/source/text/scalc/01/func_aggregate \
 helpcontent2/source/text/scalc/01/func_averageif \
+helpcontent2/source/text/scalc/01/func_averageifs \
 helpcontent2/source/text/scalc/01/func_date \
 helpcontent2/source/text/scalc/01/func_datedif \
 helpcontent2/source/text/scalc/01/func_datevalue \
diff --git a/source/text/scalc/01/04060184.xhp 
b/source/text/scalc/01/04060184.xhp
index 4e12e57..d517a3f 100644
--- a/source/text/scalc/01/04060184.xhp
+++ b/source/text/scalc/01/04060184.xhp
@@ -170,6 +170,10 @@ oldref="162">Example
 
 
 
+
+
+
+
 
 MODE function
 most common value
diff --git a/source/text/scalc/01/func_averageif.xhp 
b/source/text/scalc/01/func_averageif.xhp
index a772961..b47eec2 100644
--- a/source/text/scalc/01/func_averageif.xhp
+++ b/source/text/scalc/01/func_averageif.xhp
@@ -27,46 +27,46 @@
 Returns the arithmetic mean of all cells 
in a range that satisfy a given condition. The AVERAGEIF function sums up all 
the results that match the logical test and divides this sum by the quantity of 
selected values.
 
 Syntax
-AVERAGEIF(Range; Criteria [; Average_Range ])
+AVERAGEIF(Range; Criterion [; Average_Range ])
 Range – required argument. An array, a name of 
named range or a label of a column or a row containing numbers for averaging or 
numbers or text for the condition.
-Criteria – required argument. A condition in 
the form of expression or cell reference with expression that defines what 
cells should be used to calculate the mean. The expression can contain text, 
numbers or regular expressions.
+Criterion – required argument. A condition in 
the form of expression or a cell reference with expression that defines what 
cells should be used to calculate the mean. The expression can contain text, 
numbers or regular expressions.
 Average_Range – optional. It is a range of 
values for calculating the mean.
 Note that if 
the Average_Range is not specified, Range is used for 
both, the calculation of the mean and the search according to the condition. If 
the Average_Range is specified, the Range is used 
only for the condition test, while Average_Range is used for the 
mean calculation.
-The Criteria needs to be a string expression, in particular, the 
Criteria needs to be enclosed in quotation marks ("Criteria") with 
the exception of the names of functions, cell references and an operation of a 
string concatenation ().
+The Criterion needs to be a string expression, in particular, the 
Criterion needs to be enclosed in quotation marks ("Criterion") 
with the exception of the names of functions, cell references and an operation 
of a string concatenation ().
 If a cell 
in a range of values for calculating the mean is empty or contains text, 
function AVERAGEIF ignores this cell.
 If the whole range is empty, contains only text or all values of the range do 
not satisfy the condition (or any combination of those), the function returns 
the #DIV/0! error. 
 
-In all 
calculations below, range for average calculation contains the row #6, but it 
is ignored because it contains text.
+In all 
calculations below, range for average calculation contains the row #6, but it 
is ignored, because it contains text.
 Simple usage
-=AVERAGEIF(B6:B6;"35")
+=AVERAGEIF(B2:B6;"35")
 Calculates the average for values of the range B2:B6 that are 
less than 35. Returns 19, because the second row does not participate in the 
calculation.
-=AVERAGEIF(B2:B6;""MAX(B2:B6))
+=AVERAGEIF(B2:B6;""MAX(B2:B6))
 Calculates the average for values of the same range that are 
less than the maximum value of this range. Returns 19, because the largest 
value 

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17e506d3ab2a57f40ba625e00eef524a6a4cc2b8
Author: tagezi <lera.goncha...@gmail.com>
Date:   Tue Oct 6 23:41:14 2015 +0300

Updated core
Project: help  27b584d0126fce1c74b6f89d3ce766ea46fa622c

Added discription AVERAGEIFS

func_averageif.xhp - corrected typos
added ODF 1.2
added the link to AVERAGEIFS
UPD1 added the function in the 04060184.xhp file
UPD2 Changed in accordance with the comment of Olivier (08.10 12:47 AM)
UPD3 corrected some typos

Change-Id: I659991e24418f5328780ca67eef5d3e939e22e7d
Reviewed-on: https://gerrit.libreoffice.org/19236
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index 7c74f4a..27b584d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7c74f4a55c7171419a78aa18f6d8842fe4f62833
+Subproject commit 27b584d0126fce1c74b6f89d3ce766ea46fa622c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e48533c21a015d19910373d5c7fd9feaa416622
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Oct 8 22:23:57 2015 +0300

Updated core
Project: help  595364469b3f741b355c4d1193e711aa9063d33e

Added description SUMIFS function

func_sumifs.xhp is new
In func_averageifs.xhp added the link to SUMIFS
added a string in Note about operators

Change-Id: Ied9617bbd0dd33cf5fc2afa01f20b018dd5cffd0
Reviewed-on: https://gerrit.libreoffice.org/19257
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index 27b584d..5953644 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 27b584d0126fce1c74b6f89d3ce766ea46fa622c
+Subproject commit 595364469b3f741b355c4d1193e711aa9063d33e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[tagezi]

 AllLangHelp_scalc.mk |1 
 source/text/scalc/01/04060106.xhp|4 +
 source/text/scalc/01/func_averageifs.xhp |3 -
 source/text/scalc/01/func_sumifs.xhp |   72 +++
 4 files changed, 79 insertions(+), 1 deletion(-)

New commits:
commit 595364469b3f741b355c4d1193e711aa9063d33e
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Oct 8 22:23:57 2015 +0300

Added description SUMIFS function

func_sumifs.xhp is new
In func_averageifs.xhp added the link to SUMIFS
added a string in Note about operators

Change-Id: Ied9617bbd0dd33cf5fc2afa01f20b018dd5cffd0
Reviewed-on: https://gerrit.libreoffice.org/19257
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 96f873a..6395e91 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -200,6 +200,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_numbervalue \
 helpcontent2/source/text/scalc/01/func_now \
 helpcontent2/source/text/scalc/01/func_second \
+helpcontent2/source/text/scalc/01/func_sumifs \
 helpcontent2/source/text/scalc/01/func_time \
 helpcontent2/source/text/scalc/01/func_timevalue \
 helpcontent2/source/text/scalc/01/func_today \
diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index 2cb6846..fb526b3 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -1053,6 +1053,10 @@ oldref="443">Example
 =SUMIF(A1:A10;"0";B1:10) - sums values from the 
range B1:B10 only if the corresponding values in the range A1:A10 are 
0.
 See 
COUNTIF() for some more syntax examples that can be used with 
SUMIF().
 
+
+
+
+
 
 TAN function
 
diff --git a/source/text/scalc/01/func_averageifs.xhp 
b/source/text/scalc/01/func_averageifs.xhp
index 93ae633..bc450f0 100644
--- a/source/text/scalc/01/func_averageifs.xhp
+++ b/source/text/scalc/01/func_averageifs.xhp
@@ -35,6 +35,7 @@
 Criterion2 – Optional. Criterion2 and all the 
following mean the same as Criterion1.
 The logical 
relation between criteria can be defined as logical AND (conjunction). In other 
words, if and only if all given criteria are met, a value from the 
corresponding cell of the given Average_range is taken into calculation of the 
mean.
 The Criterion needs to be a string expression, in particular, the 
Criterion needs to be enclosed in quotation marks ("Criterion") 
with the exception of the names of functions, cell references and the operator 
of a string concatenation ().
+The operators equal to (=), not equal to (>), greater than (>), greater 
than or equal to (>=), less than (), and less than or equal to (=) can 
be used in criterion arguments for comparison of numbers.
 The function can have up to 255 arguments, meaning that you can specify 127 
criteria ranges and criteria for it.
 If a cell 
in a range of values for calculating the mean is empty or contains text, the 
function AVERAGEIFS ignores this cell.
 If a cell contains TRUE, it is treated as 1, if a cell contains FALSE – as 0 
(zero).
@@ -57,7 +58,7 @@ If the range of values for calculating the mean and any range 
for finding criter
 =AVERAGEIFS(C2:C6;A2:A6;E2".*";B2:B6;""MAX(B2:B6))
 If E2 = 
pen, the function returns 65, because the link to the cell is substituted with 
its content.
 
-AVERAGE, AVERAGEA, , MAX, MIN
+AVERAGE, AVERAGEA, , , MAX, MIN
 
 
 
diff --git a/source/text/scalc/01/func_sumifs.xhp 
b/source/text/scalc/01/func_sumifs.xhp
new file mode 100644
index 000..2e0e44c
--- /dev/null
+++ b/source/text/scalc/01/func_sumifs.xhp
@@ -0,0 +1,72 @@
+
+
+
+
+
+  
+SUMIFS function
+text/scalc/01/func_sumifs.xhp
+  
+
+
+
+
+
+
+  SUMIFS function
+  sum;satisfying conditions
+
+SUMIFS 
function
+Returns the sum of the values of cells in a 
range that meets multiple criteria in multiple 
ranges.
+
+
+Syntax
+SUMIFS( 
Sum_Range ; Criterion_range1 ; Criterion1 [ ; Criterion_range2 ; Criterion2 
[;...]])
+
+Sum_Range – required argument. It is a range of 
cells, a name of a named range or a label of a column or a row containing 
values for calculating the sum.
+Criterion_range1 – required argument. It is a 
range of cells, a name of a named range or a label of a column or a row 
containing values for finding the corresponding criterion.
+Criterion1 – required argument. A condition in 
the form of expression or cell reference with expression that defines what 
cells should be used to calculate the sum. The expression can contain text, 
numbers or regular expressions. 
+Criterion_range2 – Optional. Criterion_range2 
and all the following mean the same as Criterion_range1.
+Criterion2 – Optional. Criterion2 and all the 
following mean the same as

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[tagezi]

 AllLangHelp_scalc.mk   |2 
 source/text/scalc/01/04060184.xhp  |4 
 source/text/scalc/01/ex_data_stat_func.xhp |  125 +
 source/text/scalc/01/func_averageif.xhp|   72 
 4 files changed, 203 insertions(+)

New commits:
commit 7c74f4a55c7171419a78aa18f6d8842fe4f62833
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sat Sep 26 20:56:19 2015 +0300

Added description and examples of the AVERAGEIF function

UPD: Changed in accordance with the comment of Olivier Hallot (Sep 29 7:31 
PM)
Added value for the missing ID (string 80)
UPD2: typo: forboth -> for both
table for an example was moved to a separate file
the attribute "role" of the tag "paragraph" for all an example
has been changed from "paragraph" to "example"
UDP3: double IDs was deleted in ex_data_stat_func.xhp

Change-Id: I31b377715db133bfaab59047f9613171db8659e1
Reviewed-on: https://gerrit.libreoffice.org/1
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 90abc10..8ecad3e 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -179,8 +179,10 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/12120100 \
 helpcontent2/source/text/scalc/01/12120200 \
 helpcontent2/source/text/scalc/01/12120300 \
+helpcontent2/source/text/scalc/01/ex_data_stat_func \
 helpcontent2/source/text/scalc/01/format_graphic \
 helpcontent2/source/text/scalc/01/func_aggregate \
+helpcontent2/source/text/scalc/01/func_averageif \
 helpcontent2/source/text/scalc/01/func_date \
 helpcontent2/source/text/scalc/01/func_datedif \
 helpcontent2/source/text/scalc/01/func_datevalue \
diff --git a/source/text/scalc/01/04060184.xhp 
b/source/text/scalc/01/04060184.xhp
index a52a06f..4e12e57 100644
--- a/source/text/scalc/01/04060184.xhp
+++ b/source/text/scalc/01/04060184.xhp
@@ -166,6 +166,10 @@ oldref="162">Example
 =AVERAGEA(A1:A50)
 
 
+
+
+
+
 
 MODE function
 most common value
diff --git a/source/text/scalc/01/ex_data_stat_func.xhp 
b/source/text/scalc/01/ex_data_stat_func.xhp
new file mode 100644
index 000..b85b770
--- /dev/null
+++ b/source/text/scalc/01/ex_data_stat_func.xhp
@@ -0,0 +1,125 @@
+
+
+
+
+
+  
+Examples Dataset for Statistical 
Functions
+/text/scalc/01/ex_data_stat_func.xhp
+  
+
+
+
+Examples Dataset for a family of the AVERAGE
+
+Examples
+Consider the following table
+
+  
+
+
+
+  A
+
+
+  B
+
+
+  C
+
+  
+  
+
+  1
+
+
+  Product Name
+
+
+  Sales
+
+
+  Revenue
+
+  
+  
+
+  2
+
+
+  pencil
+
+
+  20
+
+
+  65
+
+  
+  
+
+  3
+
+
+  pen
+
+
+  35
+
+
+  85
+
+  
+  
+
+  4
+
+
+  notebook
+
+
+  20
+
+
+  190
+
+  
+  
+
+  5
+
+
+  book
+
+
+  17
+
+
+  180
+
+  
+
+
+  6
+
+
+  pencil-case
+
+
+  not
+
+
+  not
+
+  
+
+
+
+
diff --git a/source/text/scalc/01/func_averageif.xhp 
b/source/text/scalc/01/func_averageif.xhp
new file mode 100644
index 000..a772961
--- /dev/null
+++ b/source/text/scalc/01/func_averageif.xhp
@@ -0,0 +1,72 @@
+
+
+
+
+
+  
+AVERAGEIF function
+/text/scalc/01/func_averageif.xhp
+  
+
+
+
+
+
+
+  AVERAGEIF function
+  arithmetic mean;satisfying condition
+
+AVERAGEIF 
function
+Returns the arithmetic mean of all cells 
in a range that satisfy a given condition. The AVERAGEIF function sums up all 
the results that match the logical test and divides this sum by the quantity of 
selected values.
+
+Syntax
+AVERAGEIF(Range; Criteria [; Average_Range ])
+Range – required argument. An array, a name of 
named range or a label of a column or a row containing numbers for averaging or 
numbers or text for the condition.
+Criteria – required argument. A condition in 
the form of expression or cell reference with expression that defines what 
cells should be used to calculate the mean. The expression can contain text, 
numbers or regular expressions.
+Average_Range – optional. It is a range of 
values for calculating the mean.
+Note that if 
the Average_Range is not specified, Range is used for 
both, the calculation of the mean and the search according to the condition. If 
the Average_Range is specified, the Range is used 
only for the condition test, while Average_Range is used for the 
mean calculation.
+The Criteria needs to be a string expression, in particular, the 
Criteria needs to be enclosed in quotation marks ("Criteria") with 
th

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c4da74ba1a9ece585a86a03664f79b333bfee0bb
Author: tagezi <lera.goncha...@gmail.com>
Date:   Sat Sep 26 20:56:19 2015 +0300

Updated core
Project: help  7c74f4a55c7171419a78aa18f6d8842fe4f62833

Added description and examples of the AVERAGEIF function

UPD: Changed in accordance with the comment of Olivier Hallot (Sep 29 7:31 
PM)
Added value for the missing ID (string 80)
UPD2: typo: forboth -> for both
table for an example was moved to a separate file
the attribute "role" of the tag "paragraph" for all an example
has been changed from "paragraph" to "example"
UDP3: double IDs was deleted in ex_data_stat_func.xhp

Change-Id: I31b377715db133bfaab59047f9613171db8659e1
Reviewed-on: https://gerrit.libreoffice.org/1
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index fba1e83..7c74f4a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fba1e83f120a310343f75de27c7e3cb0c5524cc7
+Subproject commit 7c74f4a55c7171419a78aa18f6d8842fe4f62833
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text

[tagezi]

 AllLangHelp_scalc.mk|1 
 source/text/scalc/01/04060106.xhp   |4 
 source/text/scalc/01/func_aggregate.xhp |  454 
 3 files changed, 459 insertions(+)

New commits:
commit fa9b83defffcd6a10aacf8f97106cd17054855cc
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Sep 24 08:39:22 2015 +0300

tdf#85228 Added description of AGGREGATE function

UPD: Changed in accordance with the comment of Regina (10:36 PM)
UPD: Corrected separators in the syntax
UPD: set up tags 

Change-Id: I05993ffec8af8dd1e997b3d2ae92ba0226b1bf28
Reviewed-on: https://gerrit.libreoffice.org/18821
Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 9afb052..90abc10 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -180,6 +180,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/12120200 \
 helpcontent2/source/text/scalc/01/12120300 \
 helpcontent2/source/text/scalc/01/format_graphic \
+helpcontent2/source/text/scalc/01/func_aggregate \
 helpcontent2/source/text/scalc/01/func_date \
 helpcontent2/source/text/scalc/01/func_datedif \
 helpcontent2/source/text/scalc/01/func_datevalue \
diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index d08f30c..2cb6846 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -131,6 +131,10 @@ oldref="85">Example
 
 =ACOTH(1.1) returns inverse hyperbolic cotangent of 
1.1, approximately 1.52226.see also ACOSH, ASINH, ATANH, 
COSH, SINH, TANH, COTH
 
+
+
+
+
 
 ASIN function
 
diff --git a/source/text/scalc/01/func_aggregate.xhp 
b/source/text/scalc/01/func_aggregate.xhp
new file mode 100644
index 000..4d8e26b
--- /dev/null
+++ b/source/text/scalc/01/func_aggregate.xhp
@@ -0,0 +1,454 @@
+
+
+
+
+
+  
+AGGREGATE function
+/text/scalc/01/func_aggregate.xhp
+  
+
+
+
+
+
+
+
+
+  AGGREGATE function
+
+
+
+AGGREGATE 
function
+This function 
returns an aggregate result of the calculations in the range. You can use 
different aggregate functions listed below. The Aggregate function enables you 
to omit hidden rows, errors, SUBTOTAL and other AGGREGATE function results in 
the calculation.
+
+AGGREGATE 
function is applied to vertical ranges of data with activated AutoFilter. If 
AutoFilter is not activated, automatic recalculation of the function result 
does not work for newly hidden rows. It is not supposed to work with horizontal 
ranges, however it can be applied to them as well, but with limitations. In 
particular, the AGGREGATE function applied to a horizontal data range does not 
recognize hiding columns, however correctly omits errors and results of 
SUBTOTAL and other AGGREGATE functions embedded into the row. 
+
+Syntax
+AGGREGATE(Function; Option; Ref1 [; Ref2 [; …]])
+or
+AGGREGATE(Function; Option; Array [; k])
+Function – obligatory argument. A function 
index or a reference to a cell with value from 1 to 19, in accordance with the 
following table. 
+
+
+  
+
+  Function index
+
+
+  Function applied
+
+  
+  
+
+  1
+
+
+  AVERAGE
+
+  
+  
+
+  2
+
+
+  COUNT
+
+  
+  
+
+  3
+
+
+  COUNTA
+
+  
+  
+
+  4
+
+
+  MAX
+
+  
+  
+
+  5
+
+
+  MIN
+
+  
+  
+
+  6
+
+
+  PRODUCT
+
+  
+  
+
+  7
+
+
+  STDEV.S
+
+  
+  
+
+  8
+
+
+  STDEV.P
+
+  
+  
+
+  9
+
+
+  SUM
+
+  
+  
+
+  10
+
+
+  VAR.S
+
+  
+  
+
+  11
+
+
+  VAR.P
+
+  
+  
+
+  12
+
+
+  MEDIAN
+
+  
+  
+
+  13
+
+
+  MODE.SNGL
+
+  
+  
+
+  14
+
+
+  LARGE
+
+  
+  
+
+  15
+
+
+  SMALL
+
+  
+  
+
+  16
+
+
+  PERCENTILE.INC 
+
+  
+  
+
+  17
+
+
+  QUARTILE.INC
+
+  
+  
+
+  18
+
+
+  PERCENTILE.EXC
+
+  
+  
+
+  19
+
+
+  QUARTILE.EXC
+
+  
+
+
+Option – obligatory argument. An option index 
or reference to a cell with value from 0 to 7 determines what to ignore in the 
range for the function.
+
+
+  
+
+  Option index
+
+
+  Option applied
+
+  
+  
+
+  0
+
+
+  Ignore only nested SUBTOTAL and AGGREGATE functions 

+
+  
+  
+
+  1
+
+
+  Ignore only hidden rows, nested SUBTOTAL and AGGREGATE 
functions 
+
+  
+  
+
+  2
+
+
+  Ignore only errors, ne

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0a8b89753c673695146b950ddec66e1ee02cb55
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Sep 24 08:39:22 2015 +0300

Updated core
Project: help  fa9b83defffcd6a10aacf8f97106cd17054855cc

tdf#85228 Added description of AGGREGATE function

UPD: Changed in accordance with the comment of Regina (10:36 PM)
UPD: Corrected separators in the syntax
UPD: set up tags 

Change-Id: I05993ffec8af8dd1e997b3d2ae92ba0226b1bf28
Reviewed-on: https://gerrit.libreoffice.org/18821
Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>
Reviewed-by: Olivier Hallot <olivier.hal...@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hal...@edx.srv.br>

diff --git a/helpcontent2 b/helpcontent2
index dd688ed..fa9b83d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dd688ed491a98962477406ac75b6dc149b90f5ed
+Subproject commit fa9b83defffcd6a10aacf8f97106cd17054855cc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39818fe650511f99c8b2ea8cfb72f45fa3607998
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed Sep 16 22:32:47 2015 +0300

Updated core
Project: help  86bafd3050395dd8b7716d4353a5399591a6ab7c

the change HID_FUNC_CHISQDIST_MS to HID_FUNC_CHIVERT_MS for CHISQ.DIST.RT

Change-Id: Ibd35f30177ecceed13bc43c46dfee5d00292e635
Reviewed-on: https://gerrit.libreoffice.org/18650
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index a440ac9..86bafd3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a440ac934ac33acf7e649a4dd149c09875660d54
+Subproject commit 86bafd3050395dd8b7716d4353a5399591a6ab7c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - source/text

[tagezi]

 source/text/scalc/01/04060181.xhp |4 ++--
 source/text/scalc/01/func_datedif.xhp |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c5797294b2e81ea3c8d8a7c5bdcb799155549586
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Sep 17 03:59:16 2015 +0300

the change HID_FUNC_DATUM to HID_FUNC_DATEDIF for DATEDIF

Change-Id: I29aaa2b35c701f3966b53b80262af05442ed3f52
Reviewed-on: https://gerrit.libreoffice.org/18655
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/source/text/scalc/01/func_datedif.xhp 
b/source/text/scalc/01/func_datedif.xhp
index 3719022..c695ea3 100644
--- a/source/text/scalc/01/func_datedif.xhp
+++ b/source/text/scalc/01/func_datedif.xhp
@@ -22,7 +22,7 @@
 
 DATEDIF
 
-This function returns the number of whole days, months or 
years between Start date and End date.
+This function returns the number of whole days, months 
or years between Start date and End date.
 Syntax
 DATEDIF(Start date; 
End date; Interval)
 
commit 86bafd3050395dd8b7716d4353a5399591a6ab7c
Author: tagezi <lera.goncha...@gmail.com>
Date:   Wed Sep 16 22:32:47 2015 +0300

the change HID_FUNC_CHISQDIST_MS to HID_FUNC_CHIVERT_MS for CHISQ.DIST.RT

Change-Id: Ibd35f30177ecceed13bc43c46dfee5d00292e635
Reviewed-on: https://gerrit.libreoffice.org/18650
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/source/text/scalc/01/04060181.xhp 
b/source/text/scalc/01/04060181.xhp
index 76c0847..b00c4e2 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -658,9 +658,9 @@ oldref="547">COUNTIF
 
 CHISQ.DIST.RT function
 
-
+
 CHISQ.DIST.RT
-Returns the probability value 
from the indicated Chi square that a hypothesis is confirmed. 
CHISQ.DIST.RT compares the Chi square value to be given for a random sample 
that is calculated from the sum of (observed value-expected value)^2/expected 
value for all values with the theoretical Chi square distribution and 
determines from this the probability of error for the hypothesis to be 
tested.
+Returns the probability value 
from the indicated Chi square that a hypothesis is confirmed. 
CHISQ.DIST.RT compares the Chi square value to be given for a random sample 
that is calculated from the sum of (observed value-expected value)^2/expected 
value for all values with the theoretical Chi square distribution and 
determines from this the probability of error for the hypothesis to be 
tested.
 The probability determined by CHISQ.DIST.RT can also be determined 
by CHITEST.
 Syntax
 CHISQ.DIST.RT(Number; DegreesFreedom)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit adacb1e01aa22bfbd5a8726ec81985e988ac420c
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Sep 17 04:03:38 2015 +0300

Updated core
Project: help  dbc9884be99df2c9669a612bdcac346c44914c48

the change HID_FUNC_NORMDIST_MS to HID_FUNC_LOGNORMDIST_MS for LOGNORM.DIST

Change-Id: I2664ad8ca72715f638cc907a3129ce97b03a0a7d
Reviewed-on: https://gerrit.libreoffice.org/18657
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 925e58c..dbc9884 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 925e58c5edf824a7d84e0b1e4eb6eaa5b7a5e309
+Subproject commit dbc9884be99df2c9669a612bdcac346c44914c48
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - source/text

[tagezi]

 source/text/scalc/01/04060181.xhp |4 ++--
 source/text/scalc/01/04060183.xhp |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit dbc9884be99df2c9669a612bdcac346c44914c48
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Sep 17 04:03:38 2015 +0300

the change HID_FUNC_NORMDIST_MS to HID_FUNC_LOGNORMDIST_MS for LOGNORM.DIST

Change-Id: I2664ad8ca72715f638cc907a3129ce97b03a0a7d
Reviewed-on: https://gerrit.libreoffice.org/18657
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/source/text/scalc/01/04060183.xhp 
b/source/text/scalc/01/04060183.xhp
index 54bc190..84be734 100644
--- a/source/text/scalc/01/04060183.xhp
+++ b/source/text/scalc/01/04060183.xhp
@@ -277,9 +277,9 @@
 LOGNORM.DIST function
 lognormal distribution
 mw added one entry
-
+
 LOGNORM.DIST
-Returns the values of a lognormal 
distribution.
+Returns the values of a 
lognormal distribution.
 Syntax
 LOGNORM.DIST(Number; Mean; StDev; Cumulative)
 
commit 925e58c5edf824a7d84e0b1e4eb6eaa5b7a5e309
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Sep 17 04:02:18 2015 +0300

the change HID_FUNC_CHISQINV_MS to HID_FUNC_CHIINV_MS for CHISQ.INV.RT

Change-Id: I52148314e4ab3f400a4d2f84394c90f6e4654c6e
Reviewed-on: https://gerrit.libreoffice.org/18656
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/source/text/scalc/01/04060181.xhp 
b/source/text/scalc/01/04060181.xhp
index b00c4e2..56f748e 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -386,9 +386,9 @@ oldref="547">COUNTIF
 
 CHISQ.INV.RT function
 
-
+
 CHISQ.INV.RT
-Returns the inverse of the 
one-tailed probability of the chi-squared distribution.
+Returns the inverse of the 
one-tailed probability of the chi-squared distribution.
 Syntax
 CHISQ.INV.RT(Number; DegreesFreedom)
 Number is the value of the error 
probability.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[tagezi]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 516b465f866cd7027a048149d4ea4142f9785115
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Sep 17 04:02:18 2015 +0300

Updated core
Project: help  925e58c5edf824a7d84e0b1e4eb6eaa5b7a5e309

the change HID_FUNC_CHISQINV_MS to HID_FUNC_CHIINV_MS for CHISQ.INV.RT

Change-Id: I52148314e4ab3f400a4d2f84394c90f6e4654c6e
Reviewed-on: https://gerrit.libreoffice.org/18656
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index c579729..925e58c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c5797294b2e81ea3c8d8a7c5bdcb799155549586
+Subproject commit 925e58c5edf824a7d84e0b1e4eb6eaa5b7a5e309
commit 10f3fba6e238c09d5edeb8b9707e1f4e1a1ea61b
Author: tagezi <lera.goncha...@gmail.com>
Date:   Thu Sep 17 03:59:16 2015 +0300

Updated core
Project: help  c5797294b2e81ea3c8d8a7c5bdcb799155549586

the change HID_FUNC_DATUM to HID_FUNC_DATEDIF for DATEDIF

Change-Id: I29aaa2b35c701f3966b53b80262af05442ed3f52
Reviewed-on: https://gerrit.libreoffice.org/18655
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 86bafd3..c579729 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 86bafd3050395dd8b7716d4353a5399591a6ab7c
+Subproject commit c5797294b2e81ea3c8d8a7c5bdcb799155549586
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits