[Libreoffice-commits] core.git: desktop/source include/opencl opencl/source vcl/source
desktop/source/app/opencl.cxx |1 +
include/opencl/OpenCLZone.hxx |9 +
opencl/source/OpenCLZone.cxx |6 ++
vcl/source/app/svmain.cxx |8
4 files changed, 24 insertions(+)
New commits:
commit 32881f01833dbcefd5600e1135dd8743178bfd96
Author: Tor Lillqvist
Date: Fri Aug 12 16:53:48 2016 +0300
tdf#100965: Restart on initialisation-time OpenCL crash
Add a flag to the OpenCLZone indicating whether we are performing the
first-start OpenCL functionality verification, so that if we run into
a crash that is caught by the VCL VCLExceptionSignal_impl() handler,
we terminate the process with the EXITHELPER_NORMAL_RESTART
status after first having disabled OpenCL use. The wrapper process will
then restart soffice.bin. This is for Windows only so far.
This matches what we do if OpenGL fails early during start of
LibreOffice.
Change-Id: Ibb9bf3a86b7521bf16728de2a118ad4323be674b
Reviewed-on: https://gerrit.libreoffice.org/28086
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 7eb8339..20bb981 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -125,6 +125,7 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2
> &xDesktop)
SAL_INFO("opencl", "Initiating test of OpenCL device");
OpenCLZone aZone;
+OpenCLZone::enterInitialTest();
OUString aDevice =
officecfg::Office::Calc::Formula::Calculation::OpenCLDevice::get();
OUString aSelectedCLDeviceVersionID;
diff --git a/include/opencl/OpenCLZone.hxx b/include/opencl/OpenCLZone.hxx
index eca530a..0d2059d 100644
--- a/include/opencl/OpenCLZone.hxx
+++ b/include/opencl/OpenCLZone.hxx
@@ -19,6 +19,7 @@ class OPENCL_DLLPUBLIC OpenCLZone
static volatile sal_uInt64 gnEnterCount;
/// how many times have we left a new CL zone
static volatile sal_uInt64 gnLeaveCount;
+static volatile bool gbInInitialTest;
public:
OpenCLZone()
@@ -29,6 +30,8 @@ public:
~OpenCLZone()
{
gnLeaveCount++;
+if (!isInZone())
+gbInInitialTest = false;
}
static bool isInZone()
@@ -36,7 +39,13 @@ public:
return gnEnterCount != gnLeaveCount;
}
+static bool isInInitialTest()
+{
+return gbInInitialTest;
+}
+
static void hardDisable();
+static void enterInitialTest();
};
#endif // INCLUDED_OPENCL_INC_OPENCL_ZONE_HXX
diff --git a/opencl/source/OpenCLZone.cxx b/opencl/source/OpenCLZone.cxx
index 03521a2..52d6ada 100644
--- a/opencl/source/OpenCLZone.cxx
+++ b/opencl/source/OpenCLZone.cxx
@@ -21,6 +21,7 @@
sal_uInt64 volatile OpenCLZone::gnEnterCount = 0;
sal_uInt64 volatile OpenCLZone::gnLeaveCount = 0;
+bool volatile OpenCLZone::gbInInitialTest = false;
/**
* Called from a signal handler if we get
@@ -47,4 +48,9 @@ void OpenCLZone::hardDisable()
}
}
+void OpenCLZone::enterInitialTest()
+{
+gbInInitialTest = true;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index aba97b5..4984ff4 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -24,6 +24,8 @@
#include
#include
+#include
+
#include
#include
@@ -123,7 +125,13 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void*
/*pData*/, oslSignalInfo
#endif
#if HAVE_FEATURE_OPENCL
if (OpenCLZone::isInZone())
+{
OpenCLZone::hardDisable();
+#ifdef _WIN32
+if (OpenCLZone::isInInitialTest())
+TerminateProcess(GetCurrentProcess(),
EXITHELPER_NORMAL_RESTART);
+#endif
+}
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/hicontrast
icon-themes/galaxy/svx/res/cropmarkers.png |binary icon-themes/hicontrast/svx/res/cropmarkers.png |binary 2 files changed New commits: commit 7ffe3d742ee992cd704a52d9aeb9b131dded7d14 Author: Regina Henschel Date: Fri Aug 12 16:50:32 2016 +0200 tdf101291 Resize cropmarkers.png to requested dimension The pick-up positions for handles were changed some time ago and fit cropmarkers.png of icon-themes Tango and Breeze. But Galaxy and HighContrast were not adjusted. The patch will bring this by. Change-Id: Ia55cc8c8196c2125f46f8f5755ec1063d68cb8e7 Reviewed-on: https://gerrit.libreoffice.org/28089 Tested-by: Jenkins Reviewed-by: jan iversen diff --git a/icon-themes/galaxy/svx/res/cropmarkers.png b/icon-themes/galaxy/svx/res/cropmarkers.png old mode 100644 new mode 100755 index 7c240df..2e11d17 Binary files a/icon-themes/galaxy/svx/res/cropmarkers.png and b/icon-themes/galaxy/svx/res/cropmarkers.png differ diff --git a/icon-themes/hicontrast/svx/res/cropmarkers.png b/icon-themes/hicontrast/svx/res/cropmarkers.png old mode 100644 new mode 100755 index 001b531..d4e4f48 Binary files a/icon-themes/hicontrast/svx/res/cropmarkers.png and b/icon-themes/hicontrast/svx/res/cropmarkers.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tphatch.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 8180a8c33ad271d915e05320d051177e0254179a Author: Julien Nabet Date: Sat Aug 13 21:40:43 2016 +0200 cppcheck: redundant assignment tphatch.cxx Change-Id: Idf9ebf5df0d95e045a5766c740e22b80e57f7848 Reviewed-on: https://gerrit.libreoffice.org/28109 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index ba7749b..f46eaad 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -76,9 +76,8 @@ SvxHatchTabPage::SvxHatchTabPage get(m_pCbBackgroundColor, "backgroundcolor"); get(m_pLbBackgroundColor, "backgroundcolorlb"); get(m_pHatchLB , "hatchpresetlist"); -Size aSize = getDrawListBoxOptimalSize(this); get(m_pCtlPreview, "previewctl"); -aSize = getDrawPreviewOptimalSize(this); +Size aSize = getDrawPreviewOptimalSize(this); m_pCtlPreview->set_width_request(aSize.Width()); m_pCtlPreview->set_height_request(aSize.Height()); get(m_pBtnAdd, "add"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2016-14-08_02:33:55 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/httpwstest.cpp | 111
1 file changed, 111 insertions(+)
New commits:
commit e41f8581d29ca2270fd292b205e5d65d8b695748
Author: Henry Castro
Date: Sat Aug 13 20:11:24 2016 -0400
loolwsd: test: column/row re-size
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 6f5be2f..0888b90 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -86,6 +86,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testCalcEditRendering); // Broken with multiview.
CPPUNIT_TEST(testFontList);
CPPUNIT_TEST(testStateUnoCommand);
+CPPUNIT_TEST(testColumnRowResize);
CPPUNIT_TEST_SUITE_END();
@@ -120,6 +121,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
void testCalcEditRendering();
void testFontList();
void testStateUnoCommand();
+void testColumnRowResize();
void loadDoc(const std::string& documentURL);
@@ -141,6 +143,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
std::string getFontList(const std::string& message);
void testStateChanged(const std::string& filename,
std::vector& vecComands);
+double getColRowSize(const std::string& property, const std::string&
message, int index);
public:
HTTPWSTest()
@@ -1897,6 +1900,114 @@ void HTTPWSTest::testStateUnoCommand()
}
}
+double HTTPWSTest::getColRowSize(const std::string& property, const
std::string& message, int index)
+{
+Poco::JSON::Parser parser;
+const auto result = parser.parse(message);
+const auto& command = result.extract();
+auto text = command->get("commandName").toString();
+
+CPPUNIT_ASSERT_EQUAL(std::string(".uno:ViewRowColumnHeaders"), text);
+CPPUNIT_ASSERT(command->isArray(property));
+
+auto array = command->getArray(property);
+
+CPPUNIT_ASSERT(array->isObject(index));
+
+auto item = array->getObject(index);
+
+CPPUNIT_ASSERT(item->has("size"));
+
+return item->getValue("size");
+}
+
+void HTTPWSTest::testColumnRowResize()
+{
+try
+{
+std::vector response;
+std::string documentPath, documentURL;
+double oldHeight, oldWidth;
+
+getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL);
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET,
documentURL);
+
+auto socket = loadDocAndGetSocket(_uri, documentURL,
"testColumnRowResize ");
+
+const std::string commandValues = "commandvalues
command=.uno:ViewRowColumnHeaders";
+sendTextFrame(socket, commandValues);
+response = getResponseMessage(socket, "commandvalues:",
"testColumnRowResize ");
+CPPUNIT_ASSERT_MESSAGE("did not receive a commandvalues: message as
expected", !response.empty());
+{
+std::vector json(response.begin() +
std::string("commandvalues:").length(), response.end());
+json.push_back(0);
+
+// get column 2
+oldHeight = getColRowSize("rows", json.data(), 1);
+// get row 2
+oldWidth = getColRowSize("columns", json.data(), 1);
+}
+
+// send column width
+{
+std::ostringstream oss;
+Poco::JSON::Object objJSON, objColumn, objWidth;
+double newWidth;
+
+// change column 2
+objColumn.set("type", "unsigned short");
+objColumn.set("value", 2);
+
+objWidth.set("type", "unsigned short");
+objWidth.set("value", oldWidth + 100);
+
+objJSON.set("Column", objColumn);
+objJSON.set("Width", objWidth);
+
+Poco::JSON::Stringifier::stringify(objJSON, oss);
+sendTextFrame(socket, "uno .uno:ColumnWidth " + oss.str());
+sendTextFrame(socket, commandValues);
+response = getResponseMessage(socket, "commandvalues:",
"testColumnRowResize ");
+CPPUNIT_ASSERT_MESSAGE("did not receive a commandvalues: message
as expected", !response.empty());
+std::vector json(response.begin() +
std::string("commandvalues:").length(), response.end());
+json.push_back(0);
+newWidth = getColRowSize("columns", json.data(), 1);
+CPPUNIT_ASSERT(newWidth > oldWidth);
+}
+
+// send row height
+{
+std::ostringstream oss;
+Poco::JSON::Object objJSON, objRow, objHeight;
+double newHeight;
+
+// change row 2
+objRow.set("type", "unsigned short");
+objRow.set("value", 2);
+
+objHeight.set("type", "unsigned short");
+objHeight.set("value", oldHeight + 100);
+
+objJSON.set("Row", objRow);
+objJSON.set("Height", objHeight);
+
+Poco::JSON::Stringifier::stringify(objJSON, oss);
+sendTextFrame(socket, "uno .uno:RowHeight " + oss.str());
+sendTextFrame(socket, commandValu
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7ac849da78cdeb46bbd1a3c572574cf7dfbfccad Author: Stanislav Horacek Date: Fri Aug 12 21:31:54 2016 +0200 Updated core Project: help a66bd48b54c7efea526cd2bbebbba924d8524c0e tdf#101163 adjust menu path to changing case Change-Id: Ia0c35fbff1f638040bd48971da8a536bf799367a Reviewed-on: https://gerrit.libreoffice.org/28092 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6193c8a..a66bd48 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6193c8a5f97aa5d6922b412019c6da0bfda97590 +Subproject commit a66bd48b54c7efea526cd2bbebbba924d8524c0e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040500.xhp |3 +-- source/text/swriter/guide/text_capital.xhp |6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) New commits: commit a66bd48b54c7efea526cd2bbebbba924d8524c0e Author: Stanislav Horacek Date: Fri Aug 12 21:31:54 2016 +0200 tdf#101163 adjust menu path to changing case Change-Id: Ia0c35fbff1f638040bd48971da8a536bf799367a Reviewed-on: https://gerrit.libreoffice.org/28092 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/shared/00/00040500.xhp b/source/text/shared/00/00040500.xhp index 481248b..0fb4cf1 100644 --- a/source/text/shared/00/00040500.xhp +++ b/source/text/shared/00/00040500.xhp @@ -325,8 +325,7 @@ -Choose Format - Text - Change Case -Open context menu (text) - choose Change Case +Choose Format - Text or Format - Text - Change Case diff --git a/source/text/swriter/guide/text_capital.xhp b/source/text/swriter/guide/text_capital.xhp index 0dcc06f..353663e 100644 --- a/source/text/swriter/guide/text_capital.xhp +++ b/source/text/swriter/guide/text_capital.xhp @@ -39,7 +39,7 @@ Changing the Case of Text You can change the case of text, format text with small capitals, or capitalize the first letter of each word in a selection. - When you apply formatting to your text by Format - Character, the text stays the same, it is only displayed in another way. On the other hand, when you choose Format - Text - Change Case, the text is permanently changed. + When you apply formatting to your text by Format - Character, the text stays the same, it is only displayed in another way. On the other hand, when you choose Format - Text or Format - Text - Change Case, the text is permanently changed. To Capitalize Text @@ -47,7 +47,7 @@ Do one of the following: -Choose Format - Text - Change Case - Uppercase. +Choose Format - Text - Uppercase. Choose Format - Character, click the Font Effects tab, then select the type of capitalization in the Effects box. "Capitals" capitalizes all letters. "Title" capitalizes the first letter of each word. "Small capitals" capitalizes all letters, but in a reduced font size. @@ -59,7 +59,7 @@ Do one of the following: -Choose Format - Text - Change Case - Lowercase. +Choose Format - Text - Lowercase. Choose Format - Character, click the Font Effects tab, then select "Lowercase" in the Effects box. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/gotopagedialog.ui | 20 +++- 1 file changed, 3 insertions(+), 17 deletions(-) New commits: commit 96e1588c1a176e0751cf72b27f099ef3a1a544c0 Author: Yousuf Philips Date: Sat Aug 13 17:26:43 2016 +0400 tdf#83054 Remove help button from go to page dialog Change-Id: I52922b7029191a45b43579cd8b90f6245a1db19f Reviewed-on: https://gerrit.libreoffice.org/28103 Reviewed-by: Akshay Deep Tested-by: Akshay Deep diff --git a/sw/uiconfig/swriter/ui/gotopagedialog.ui b/sw/uiconfig/swriter/ui/gotopagedialog.ui index 345d308..211acaf 100644 --- a/sw/uiconfig/swriter/ui/gotopagedialog.ui +++ b/sw/uiconfig/swriter/ui/gotopagedialog.ui @@ -17,21 +17,6 @@ False end - -gtk-help -True -True -True -True - - -False -True -0 -True - - - gtk-ok True @@ -73,6 +58,7 @@ True False +center 6 12 12 @@ -94,6 +80,7 @@ True True +5 number @@ -105,7 +92,7 @@ True False -True +end 0 Page: True @@ -125,7 +112,6 @@ - button1 ok cancel ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05020301.xhp |4
1 file changed, 4 insertions(+)
New commits:
commit 6193c8a5f97aa5d6922b412019c6da0bfda97590
Author: Laurent Balland-Poirier
Date: Sat Aug 13 12:56:21 2016 +0200
Add format star to repeat character
Number format modifier (*)
Change-Id: I9362ce7f8e87b2f9b957085da241c040316ed813
Reviewed-on: https://gerrit.libreoffice.org/28100
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/source/text/shared/01/05020301.xhp
b/source/text/shared/01/05020301.xhp
index 934a9bf..45bfdb8 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -193,6 +193,10 @@
To include text in a number format that is applied to a cell that
might contain text, enclose the text by double quotation marks (" "), and then
add an at sign (@). For example, enter "Total for "@ to display
"Total for December".
Spaces
To use a character to define the width of a space in a number
format, type an underscore ( _ ) followed by the character. The width of the
space varies according to the width of the character that you choose. For
example, _M creates a wider space than _i.
+To fill free space with a given character, use star character (*)
followed by this character. For instance:
+*\0
+will display integer value (0) preceded by as many as needed
backslash characters (\) to fill column width. For accounting representation,
you may left align currency symbol with a format similar to:
+$_-* 0.--;$-* 0.--;$_-* -
Color
To set the color of a section of a number format code, insert one
of the following color names in square brackets [ ]:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6b2b648aff0f40eb85caafb49d3471545f891168 Author: Laurent Balland-Poirier Date: Sat Aug 13 12:56:21 2016 +0200 Updated core Project: help 6193c8a5f97aa5d6922b412019c6da0bfda97590 Add format star to repeat character Number format modifier (*) Change-Id: I9362ce7f8e87b2f9b957085da241c040316ed813 Reviewed-on: https://gerrit.libreoffice.org/28100 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6071229..6193c8a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6071229bf10bad31360c9347d8a785fe8446608a +Subproject commit 6193c8a5f97aa5d6922b412019c6da0bfda97590 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05020300.xhp |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 6071229bf10bad31360c9347d8a785fe8446608a Author: Laurent Balland-Poirier Date: Sat Aug 13 12:14:14 2016 +0200 New UI option Denominator places For fraction format, "Decimal places" is replaced by "Deniminator places" Merge both related topics as they are linked to the same page. Change-Id: Ic37b284e2504a989f940da1cbaf4dfbb0a5a8acc Reviewed-on: https://gerrit.libreoffice.org/28099 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/shared/01/05020300.xhp b/source/text/shared/01/05020300.xhp index aba7ece..ce241c9 100644 --- a/source/text/shared/01/05020300.xhp +++ b/source/text/shared/01/05020300.xhp @@ -90,6 +90,10 @@ Decimal places Enter the number of decimal places that you want to display. + + Denominator places + With fraction format, enter the number of places for the denominator that you want to display. + Leading zeroes Enter the maximum number of zeroes to display in front of the decimal point. @@ -128,8 +132,7 @@ - Number format codes - Custom format codes + Number format codes: custom format codes defined by user. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bb7f530e909b86d10b0b686df327bc0d79d3c69f Author: Laurent Balland-Poirier Date: Sat Aug 13 12:14:14 2016 +0200 Updated core Project: help 6071229bf10bad31360c9347d8a785fe8446608a New UI option Denominator places For fraction format, "Decimal places" is replaced by "Deniminator places" Merge both related topics as they are linked to the same page. Change-Id: Ic37b284e2504a989f940da1cbaf4dfbb0a5a8acc Reviewed-on: https://gerrit.libreoffice.org/28099 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d4501ba..6071229 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d4501baed063dd06f7b74c1354a8681ea46c326e +Subproject commit 6071229bf10bad31360c9347d8a785fe8446608a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help with isssue with gerrit
Thank you Jan, Regina and Giuseppe. All is OK now. Regards Em 13/08/2016 13:28, jan iversen escreveu: > Hi > > url and pushurl are not the same. > > the file you list (hopefully it is core/.git/modules/helpcontent2/config) is > exactly like mine. > > The pushurl are stored in .git/config and looks like: >pushurl = ssh://j...@gerrit.libreoffice.org:29418/core > > I assume you did do: > > git clone git://anongit.freedesktop.org/libreoffice/core core > cd core > git submodule update --init helpcontent2 > edit core/.git/config and add your pushurl > > Otherwise that could explain your problem. > > rgds > jan I. > > > >> On 13 Aug 2016, at 18:18, Olivier Hallot >> wrote: >> >> Hello Regina >> >> Here is what I have in the file config you mentioned. >> >> 8<--- >> >> [core] >>repositoryformatversion = 0 >>filemode = true >>bare = false >>logallrefupdates = true >>worktree = ../../../helpcontent2 >> [remote "origin"] >>url = git://gerrit.libreoffice.org/help >>fetch = +refs/heads/*:refs/remotes/origin/* >> [branch "master"] >>remote = origin >>merge = refs/heads/master >> >> 8<--- >> >> I am not sure if pushurl and url means the same >> >> Thank you >> >> Olivier >> >> >> Em 13/08/2016 12:31, Regina Henschel escreveu: >>> Hi Olivier, >>> >>> there should be .git/modules/helpcontent2/config. Does it has a valid >>> url or pushurl? >>> >>> Kind regards >>> Regina >>> >>> >>> >>> Olivier Hallot schrieb: Hi I had to clone from scratch my LO repo and I fixed a patch. On attempting to push branch 'cla' I get git push origin cla:refs/for/master fatal: remote error: access denied or repository not exported: /help while running tdf@olivier-ntbk:~/git/core$ ./logerrit test Enter passphrase for key '/home/tdf/.ssh/mykey-fdo': Your gerrit setup was successful! I am lost here. Any help is appreciated. Thank you >>> ___ >>> LibreOffice mailing list >>> LibreOffice@lists.freedesktop.org >>> https://lists.freedesktop.org/mailman/listinfo/libreoffice >> -- >> Olivier Hallot >> Comunidade LibreOffice >> Rio de Janeiro - Brasil >> >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/libreoffice -- Olivier Hallot Comunidade LibreOffice Rio de Janeiro - Brasil ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help with isssue with gerrit
Hi Olivier, Olivier Hallot schrieb: Hello Regina Here is what I have in the file config you mentioned. 8<--- [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true worktree = ../../../helpcontent2 [remote "origin"] url = git://gerrit.libreoffice.org/help I have added pushurl = ssh://logerrit/help in section [remote "origin"] Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help with isssue with gerrit
Hi url and pushurl are not the same. the file you list (hopefully it is core/.git/modules/helpcontent2/config) is exactly like mine. The pushurl are stored in .git/config and looks like: pushurl = ssh://j...@gerrit.libreoffice.org:29418/core I assume you did do: git clone git://anongit.freedesktop.org/libreoffice/core core cd core git submodule update --init helpcontent2 edit core/.git/config and add your pushurl Otherwise that could explain your problem. rgds jan I. > On 13 Aug 2016, at 18:18, Olivier Hallot > wrote: > > Hello Regina > > Here is what I have in the file config you mentioned. > > 8<--- > > [core] >repositoryformatversion = 0 >filemode = true >bare = false >logallrefupdates = true >worktree = ../../../helpcontent2 > [remote "origin"] >url = git://gerrit.libreoffice.org/help >fetch = +refs/heads/*:refs/remotes/origin/* > [branch "master"] >remote = origin >merge = refs/heads/master > > 8<--- > > I am not sure if pushurl and url means the same > > Thank you > > Olivier > > > Em 13/08/2016 12:31, Regina Henschel escreveu: >> Hi Olivier, >> >> there should be .git/modules/helpcontent2/config. Does it has a valid >> url or pushurl? >> >> Kind regards >> Regina >> >> >> >> Olivier Hallot schrieb: >>> Hi >>> >>> I had to clone from scratch my LO repo and I fixed a patch. On >>> attempting to push branch 'cla' I get >>> >>> git push origin cla:refs/for/master >>> fatal: remote error: access denied or repository not exported: /help >>> >>> while running >>> >>> tdf@olivier-ntbk:~/git/core$ ./logerrit test >>> Enter passphrase for key '/home/tdf/.ssh/mykey-fdo': >>> Your gerrit setup was successful! >>> >>> >>> I am lost here. Any help is appreciated. >>> >>> Thank you >> >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/libreoffice > > -- > Olivier Hallot > Comunidade LibreOffice > Rio de Janeiro - Brasil > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help with isssue with gerrit (fixed)
Hi Em 13/08/2016 13:18, Olivier Hallot escreveu: > I am not sure if pushurl and url means the same fixed pushurl as indicated in the wiki page for submodules -- Olivier Hallot Comunidade LibreOffice Rio de Janeiro - Brasil ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.ColumnHeader.js |5 +++--
loleaflet/src/control/Control.RowHeader.js|5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 817cacde84286a6963a29bb09c8606db7d71bf24
Author: Henry Castro
Date: Sat Aug 13 12:16:03 2016 -0400
loleaflet: drag & drop to unhide column/row
diff --git a/loleaflet/src/control/Control.ColumnHeader.js
b/loleaflet/src/control/Control.ColumnHeader.js
index b38ea32..ba928eb 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -109,7 +109,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
text.setAttribute('rel', 'spreadsheet-column-' +
content); // for easy addressing
text.innerHTML = content;
width = Math.round(converter.call(context, twip).x) - 1;
- if (width === -1) {
+ if (width <= 0) {
L.DomUtil.setStyle(column, 'display', 'none');
} else if (width < 10) {
text.column = iterator + 1;
@@ -211,7 +211,8 @@ L.Control.ColumnHeader = L.Control.Header.extend({
var command = {
Column: {
type: 'unsigned short',
- value: item.column
+ value: item.parentNode &&
item.parentNode.nextSibling &&
+
L.DomUtil.getStyle(item.parentNode.nextSibling, 'display') === 'none' ?
item.column + 1 : item.column
},
Width: {
type: 'unsigned short',
diff --git a/loleaflet/src/control/Control.RowHeader.js
b/loleaflet/src/control/Control.RowHeader.js
index 119c020..c4ced20 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -107,7 +107,7 @@ L.Control.RowHeader = L.Control.Header.extend({
text.setAttribute('rel', 'spreadsheet-row-' + content);
// for easy addressing
text.innerHTML = content;
height = Math.round(converter.call(context, twip).y) -
1;
- if (height === -1) {
+ if (height <= 0) {
L.DomUtil.setStyle(row, 'display', 'none');
} else if (height < 10) {
text.row = iterator + 1;
@@ -193,7 +193,8 @@ L.Control.RowHeader = L.Control.Header.extend({
var command = {
Row: {
type: 'unsigned short',
- value: item.row
+ value: item.parentNode &&
item.parentNode.nextSibling &&
+
L.DomUtil.getStyle(item.parentNode.nextSibling, 'display') === 'none' ?
item.row + 1 : item.row
},
Height: {
type: 'unsigned short',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help with isssue with gerrit
Hello Regina Here is what I have in the file config you mentioned. 8<--- [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true worktree = ../../../helpcontent2 [remote "origin"] url = git://gerrit.libreoffice.org/help fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master 8<--- I am not sure if pushurl and url means the same Thank you Olivier Em 13/08/2016 12:31, Regina Henschel escreveu: > Hi Olivier, > > there should be .git/modules/helpcontent2/config. Does it has a valid > url or pushurl? > > Kind regards > Regina > > > > Olivier Hallot schrieb: >> Hi >> >> I had to clone from scratch my LO repo and I fixed a patch. On >> attempting to push branch 'cla' I get >> >> git push origin cla:refs/for/master >> fatal: remote error: access denied or repository not exported: /help >> >> while running >> >> tdf@olivier-ntbk:~/git/core$ ./logerrit test >> Enter passphrase for key '/home/tdf/.ssh/mykey-fdo': >> Your gerrit setup was successful! >> >> >> I am lost here. Any help is appreciated. >> >> Thank you >> > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice -- Olivier Hallot Comunidade LibreOffice Rio de Janeiro - Brasil ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help with isssue with gerrit
Hi Olivier, there should be .git/modules/helpcontent2/config. Does it has a valid url or pushurl? Kind regards Regina Olivier Hallot schrieb: Hi I had to clone from scratch my LO repo and I fixed a patch. On attempting to push branch 'cla' I get git push origin cla:refs/for/master fatal: remote error: access denied or repository not exported: /help while running tdf@olivier-ntbk:~/git/core$ ./logerrit test Enter passphrase for key '/home/tdf/.ssh/mykey-fdo': Your gerrit setup was successful! I am lost here. Any help is appreciated. Thank you ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help with isssue with gerrit
Hi Olivier, On 08/13/2016 02:02 PM, Olivier Hallot wrote: Hi I had to clone from scratch my LO repo and I fixed a patch. On attempting to push branch 'cla' I get git push origin cla:refs/for/master fatal: remote error: access denied or repository not exported: /help to push to gerrit I use: ./logerrit submit master I suppose you have branch cla as child of master, right? Giuseppe. -- Kind Regards, Giuseppe Castagno aka beppec56 Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/pt-PT/BlockList.xml |1 + extras/source/autocorr/lang/pt-PT/DocumentList.xml |1 + extras/source/autocorr/lang/pt-PT/META-INF/manifest.xml |8 extras/source/autocorr/lang/pt-PT/SentenceExceptList.xml |1 + extras/source/autocorr/lang/pt-PT/WordExceptList.xml |1 + 5 files changed, 12 insertions(+) New commits: commit 5ad876c7d801466bca3864c625da46c3ff313d1e Author: Tiago Santos Date: Fri Aug 12 11:15:16 2016 + tdf#97439 autocorrect pt-PT Added autocorrect files for pt-PT on behalf of Tiago Santos Change-Id: I126c573d6c3f150992a20d583583e0cc608e6a83 Reviewed-on: https://gerrit.libreoffice.org/28078 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/extras/source/autocorr/lang/pt-PT/BlockList.xml b/extras/source/autocorr/lang/pt-PT/BlockList.xml new file mode 100644 index 000..26b8c22 --- /dev/null +++ b/extras/source/autocorr/lang/pt-PT/BlockList.xml @@ -0,0 +1 @@ +http://openoffice.org/2001/block-list"; block-list:list-name="acor_pt-PT"> diff --git a/extras/source/autocorr/lang/pt-PT/DocumentList.xml b/extras/source/autocorr/lang/pt-PT/DocumentList.xml new file mode 100644 index 000..c20d923 --- /dev/null +++ b/extras/source/autocorr/lang/pt-PT/DocumentList.xml @@ -0,0 +1 @@ ... etc. - the rest is truncated ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp
loolwsd/LOOLWSD.cpp |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c7bef135c5c1ad205105a511e8c5d3a4657d789f
Author: Henry Castro
Date: Sat Aug 13 08:59:14 2016 -0400
loolwsd: fix -Werror=shadow
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 6d1affd..58d5853 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1371,11 +1371,11 @@ void LOOLWSD::initialize(Application& self)
for (size_t i = 0; ; ++i)
{
const std::string confPath = "logging.file.property[" +
std::to_string(i) + "]";
-const auto name = config().getString(confPath + "[@name]", "");
-if (!name.empty())
+const auto confName = config().getString(confPath + "[@name]", "");
+if (!confName.empty())
{
const auto value = config().getString(confPath, "");
-logProperties.emplace(name, value);
+logProperties.emplace(confName, value);
}
else if (!config().has(confPath))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit e7d6f952f136d11451969dcf1da417fe5e0e88f9 Author: Yousuf Philips Date: Tue Jul 12 07:17:51 2016 +0400 tdf#83054 Ctrl + G opens Go To Page dialog in writer Change-Id: Ifeb61902d8ef601d9a9cb8f5ec02b995315c732f Reviewed-on: https://gerrit.libreoffice.org/27132 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 62f8cfcf..e33d7a4 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -5991,7 +5991,8 @@ I10N SHORTCUTS - NO TRANSLATE -.uno:RepeatSearch +.uno:GotoPage +.uno:RepeatSearch .uno:Save .uno:Bold ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/saveasmenucontroller.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit b13974b474ea3fd41c8eab1d21d26a79110c0be9
Author: Yousuf Philips
Date: Sat Aug 6 14:34:40 2016 +0400
Add Export... function to save split button menu
Change-Id: Iae47e0f671eed78923e3b97ef4bac65327458b41
Reviewed-on: https://gerrit.libreoffice.org/27924
Reviewed-by: Yousuf Philips
Tested-by: Yousuf Philips
diff --git a/framework/source/uielement/saveasmenucontroller.cxx
b/framework/source/uielement/saveasmenucontroller.cxx
index dd1566c..f591c40 100644
--- a/framework/source/uielement/saveasmenucontroller.cxx
+++ b/framework/source/uielement/saveasmenucontroller.cxx
@@ -86,11 +86,16 @@ void SaveAsMenuController::impl_setPopupMenu()
pVCLPopupMenu->InsertItem( ".uno:SaveAs", m_xFrame );
-// Add Save As Template/Save Remote File commands only where they are
supported.
+OUString sExportTo(".uno:ExportTo");
+if (isCommandAvailable(sExportTo))
+pVCLPopupMenu->InsertItem( sExportTo, m_xFrame );
+
OUString sSaveAsTemplate(".uno:SaveAsTemplate");
if (isCommandAvailable(sSaveAsTemplate))
pVCLPopupMenu->InsertItem( sSaveAsTemplate, m_xFrame );
+pVCLPopupMenu->InsertSeparator();
+
OUString sSaveRemote(".uno:SaveAsRemote");
if (isCommandAvailable(sSaveRemote))
pVCLPopupMenu->InsertItem( sSaveRemote, m_xFrame );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/source sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |1
sd/inc/glob.hrc |2
sd/source/core/glob.src |8 +
sd/source/ui/sidebar/SlideBackground.cxx | 85 +--
sd/source/ui/sidebar/SlideBackground.hxx |8 +
sd/uiconfig/simpress/ui/sidebarslidebackground.ui| 53 +-
6 files changed, 132 insertions(+), 25 deletions(-)
New commits:
commit 64ff7453408e578b95073db1740bfef4f500a2e4
Author: Susobhan Ghosh
Date: Wed Aug 3 23:22:53 2016 +0530
tdf#89466 Add Master Slide and Close Master View button
Impress only. Change panel title on master slide context.
Disable controls in master view.
Change-Id: Ic355a6c74d3f61ea23bcf80e2a2d7e7d7a7980b8
Reviewed-on: https://gerrit.libreoffice.org/27840
Tested-by: Jenkins
Reviewed-by: Yousuf Philips
Tested-by: Yousuf Philips
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index e1e8cce..ac13581 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -747,6 +747,7 @@
DrawImpress, HandoutPage, visible, .uno:PageSetup ;
DrawImpress, NotesPage, visible, .uno:PageSetup ;
DrawImpress, SlidesorterPage, visible, .uno:PageSetup ;
+DrawImpress, MasterPage, visible, .uno:PageSetup ;
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index bec03c2..b950a51 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -136,6 +136,8 @@
#define RID_SLIDESORTER_ICONS RID_GLOB_START+227
#define STR_DEAUTHORISE_CLIENT RID_GLOB_START+229
+#define STR_MASTERSLIDE_NAMERID_GLOB_START+230
+#define STR_MASTERPAGE_NAME RID_GLOB_START+231
#endif
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index d3b3a71..8e7fe18 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -55,6 +55,14 @@ String STR_SLIDE_NAME
{
Text [ en-US ] = "Slide" ;
};
+String STR_MASTERSLIDE_NAME
+{
+Text [ en-US ] = "Master Slide";
+};
+String STR_MASTERPAGE_NAME
+{
+Text [ en-US ] = "Master Page";
+};
String STR_MASTERPAGE
{
Text [ en-US ] = "Background" ;
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index a3c6ec9..7c9af4c 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -101,6 +101,7 @@ SlideBackground::SlideBackground(
maDspBckController(SID_DISPLAY_MASTER_BACKGROUND, *pBindings, *this),
maDspObjController(SID_DISPLAY_MASTER_OBJECTS, *pBindings, *this),
maMetricController(SID_ATTR_METRIC, *pBindings, *this),
+maCloseMasterController(SID_CLOSE_MASTER_VIEW, *pBindings, *this),
mpColorItem(),
mpGradientItem(),
mpHatchItem(),
@@ -120,6 +121,9 @@ SlideBackground::SlideBackground(
get(mpFillLB, "fillattr");
get(mpDspMasterBackground, "displaymasterbackground");
get(mpDspMasterObjects, "displaymasterobjects");
+get(mpCloseMaster, "closemasterslide");
+get(mpEditMaster, "masterslidebutton");
+get(mpMasterLabel, "masterlabel");
addListener();
Initialize();
}
@@ -129,13 +133,23 @@ SlideBackground::~SlideBackground()
disposeOnce();
}
+bool SlideBackground::IsDraw()
+{
+return ( maApplication == vcl::EnumContext::Application_Draw );
+}
+
+bool SlideBackground::IsImpress()
+{
+return ( maApplication == vcl::EnumContext::Application_Impress );
+}
+
void SlideBackground::Initialize()
{
mpPaperSizeBox->FillPaperSizeEntries( PaperSizeDraw );
mpPaperSizeBox->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
-
-
+mpCloseMaster->Hide();
+mpCloseMaster->SetClickHdl(LINK(this, SlideBackground, CloseMasterHdl));
meUnit = maPaperSizeController.GetCoreMetric();
mpMasterSlide->SetSelectHdl(LINK(this, SlideBackground, AssignMasterPage));
@@ -364,11 +378,34 @@ IMPL_LINK_TYPED(SlideBackground, EventMultiplexerListener,
EditMode eMode = pDrawViewShell->GetEditMode();
if ( eMode == EM_MASTERPAGE)
+{
+if( IsImpress() )
+{
+SetPanelTitle(SD_RESSTR(STR_MASTERSLIDE_NAME));
+mpEditMaster->Hide();
+mpCloseMaster->Show();
+}
+else
+SetPanelTitle(SD_RESSTR(STR_MASTERPAGE_NAME));
mpMasterSlide->Disable();
+mpDspMasterBa
Help with isssue with gerrit
Hi I had to clone from scratch my LO repo and I fixed a patch. On attempting to push branch 'cla' I get git push origin cla:refs/for/master fatal: remote error: access denied or repository not exported: /help while running tdf@olivier-ntbk:~/git/core$ ./logerrit test Enter passphrase for key '/home/tdf/.ssh/mykey-fdo': Your gerrit setup was successful! I am lost here. Any help is appreciated. Thank you -- Olivier Hallot Comunidade LibreOffice Rio de Janeiro - Brasil ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/inc basic/source
basic/inc/sbxbase.hxx|4 +++-
basic/source/comp/symtbl.cxx |9 -
basic/source/inc/runtime.hxx |4 ++--
basic/source/inc/symtbl.hxx |2 +-
basic/source/runtime/methods.cxx | 14 ++
basic/source/runtime/runtime.cxx |5 -
basic/source/sbx/sbxbase.cxx |2 +-
basic/source/sbx/sbxscan.cxx |8 +---
8 files changed, 22 insertions(+), 26 deletions(-)
New commits:
commit cb3a00514a6baa9fe7c0660a743b95e1baed7bb8
Author: Arnaud Versini
Date: Sun Aug 7 12:24:28 2016 +0200
BASIC: Use more often std::unique_ptr
Change-Id: I37f3b35afcf3b4dba30a6ba841a59e0d851f1ebb
Reviewed-on: https://gerrit.libreoffice.org/27930
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/basic/inc/sbxbase.hxx b/basic/inc/sbxbase.hxx
index 39d0227..12ea126 100644
--- a/basic/inc/sbxbase.hxx
+++ b/basic/inc/sbxbase.hxx
@@ -37,7 +37,9 @@ struct SbxAppData
SbxErroreSbxError; // Error code
std::vector>
m_Factories;
-SbxBasicFormater *pBasicFormater;// Pointer to Format()-Command
helper class
+
+// Pointer to Format()-Command helper class
+std::unique_ptr pBasicFormater;
LanguageTypeeBasicFormaterLangType;
// It might be useful to store this class 'global' because some string
resources are saved here
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 578d035..be8ac76 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
// All symbol names are laid down int the symbol-pool's stringpool, so that
// all symbols are handled in the same case. On saving the code-image, the
@@ -281,15 +282,13 @@ SbiSymDef::SbiSymDef( const OUString& rName ) : aName(
rName )
bByVal =
bChained =
bGlobal = false;
-pIn =
-pPool= nullptr;
+pIn = nullptr;
nDefaultId = 0;
nFixedStringLength = -1;
}
SbiSymDef::~SbiSymDef()
{
-delete pPool;
}
SbiProcDef* SbiSymDef::GetProcDef()
@@ -371,7 +370,7 @@ SbiSymPool& SbiSymDef::GetPool()
{
if( !pPool )
{
-pPool = new SbiSymPool( pIn->pParser->aGblStrings, SbLOCAL,
pIn->pParser ); // is dumped
+pPool = o3tl::make_unique( pIn->pParser->aGblStrings,
SbLOCAL, pIn->pParser );// is dumped
}
return *pPool;
}
@@ -397,7 +396,7 @@ SbiProcDef::SbiProcDef( SbiParser* pParser, const OUString&
rName,
, mbProcDecl( bProcDecl )
{
aParams.SetParent( &pParser->aPublics );
-pPool = new SbiSymPool( pParser->aGblStrings, SbLOCAL, pParser );
+pPool = o3tl::make_unique( pParser->aGblStrings, SbLOCAL,
pParser );
pPool->SetParent( &aParams );
nLine1 =
nLine2 = 0;
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 78b39a8..8278f76 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -107,12 +107,12 @@ class SbiRTLData
{
public:
-::osl::Directory* pDir;
+std::unique_ptr pDir;
SbAttributes nDirFlags;
short nCurDirPos;
OUString sFullNameToBeChecked;
-WildCard* pWildCard;
+std::unique_ptr pWildCard;
css::uno::Sequence< OUString > aDirSeq;
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index e51a846..1fff808 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -88,7 +88,7 @@ protected:
OUString aName;
SbxDataType eType;
SbiSymPool* pIn;// parent pool
-SbiSymPool* pPool; // pool for sub-elements
+std::unique_ptr pPool; // pool for sub-elements
short nLen;// string length for STRING*n
short nDims;
sal_uInt16 nId;
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 420298a..562c797 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -59,6 +59,7 @@
#include
#include
#include
+#include
using namespace comphelper;
using namespace osl;
@@ -2720,8 +2721,7 @@ OUString implSetupWildcard( const OUString& rFileParam,
SbiRTLData* pRTLData )
static sal_Char cWild1 = '*';
static sal_Char cWild2 = '?';
-delete pRTLData->pWildCard;
-pRTLData->pWildCard = nullptr;
+pRTLData->pWildCard.reset();
pRTLData->sFullNameToBeChecked.clear();
OUString aFileParam = rFileParam;
@@ -2775,7 +2775,7 @@ OUString implSetupWildcard( const OUString& rFileParam,
SbiRTLData* pRTLData )
// invalid anyway because it was not accepted by OSL before
if (aPureFileName != "*")
{
-pRTLData->pWildCard = new WildCard( aPureFileName );
+pRTLData->pWildCard = o3tl::make_unique( aPureFileName );
}
return aPathStr;
}
@@ -3012,12 +3012,11 @@ RTLFUNC(Dir)
// Read directory
bool bIncludeFolders =
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst libxslt/libxslt-configure.patch libxslt/libxslt-CVE-2015-7995.patch libxslt/libxslt-internal-symbols.patch libxslt/libxsltversion
external_deps.lst |4 -
libxslt/libxslt-CVE-2015-7995.patch| 24 --
libxslt/libxslt-configure.patch| 74 +
libxslt/libxslt-internal-symbols.patch | 18
libxslt/libxslt-win_manifest.patch |6 +-
libxslt/libxsltversion.mk |2
libxslt/makefile.mk|5 --
7 files changed, 30 insertions(+), 103 deletions(-)
New commits:
commit 8bec619aefa8913e08f10878cd6ae98340e37e21
Author: Don Lewis
Date: Fri Aug 12 22:37:50 2016 +
Upgrade bundled libxslt from version 1.1.28 to version 1.1.29 to fix:
CVE-2016-1683
CVE-2016-1684
Whether any of these affect the OpenOffice usage of libxslt is not known.
OpenOffice uses libxslt for help, document signing and encryption, and
for RDF.
libxslt-CVE-2015-7995.patch is no longer needed because this issue
has been fixed upstream.
Re-roll the other patches, some of which got simplified because of
upstream fixes.
diff --git a/external_deps.lst b/external_deps.lst
index d81dec1..1123895 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -179,8 +179,8 @@ if (SYSTEM_LIBXML != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXSLT != YES)
-MD5 = 9667bf6f9310b957254fdcf6596600b7
-name = libxslt-1.1.28.tar.gz
+MD5 = a129d3c44c022de3b9dcf6d6f288d72e
+name = libxslt-1.1.29.tar.gz
URL1 = http://xmlsoft.org/sources/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
diff --git a/libxslt/libxslt-CVE-2015-7995.patch
b/libxslt/libxslt-CVE-2015-7995.patch
deleted file mode 100644
index 59a6fbf..000
--- a/libxslt/libxslt-CVE-2015-7995.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard
-Date: Thu, 29 Oct 2015 19:33:23 +0800
-Subject: Fix for type confusion in preprocessing attributes
-
-CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
-We need to check that the parent node is an element before dereferencing
-its namespace
- libxslt/preproc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
misc/libxslt-1.1.28/libxslt/preproc.c 2012-09-11 22:59:42.0
-0700
-+++ misc/build/libxslt-1.1.28/libxslt/preproc.c2016-03-26
11:04:43.636524000 -0700
-@@ -2245,7 +2245,8 @@
- } else if (IS_XSLT_NAME(inst, "attribute")) {
- xmlNodePtr parent = inst->parent;
-
-- if ((parent == NULL) || (parent->ns == NULL) ||
-+ if ((parent == NULL) ||
-+ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
- ((parent->ns != inst->ns) &&
-(!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
- (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index 4b82fa3..24567a6 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,36 +1,18 @@
-diff -ur misc/libxslt-1.1.28/ltmain.sh misc/build/libxslt-1.1.28/ltmain.sh
misc/libxslt-1.1.28/ltmain.sh 2012-11-20 23:21:48.0 -0800
-+++ misc/build/libxslt-1.1.28/ltmain.sh2016-03-27 11:14:40.564087000
-0700
-@@ -7331,13 +7331,13 @@
- #
- case $version_type in
- # correct linux to gnu/linux during the next big refactor
--darwin|linux|osf|windows|none)
-+darwin|freebsd-elf|linux|osf|windows|none)
- func_arith $number_major + $number_minor
- current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
- ;;
--freebsd-aout|freebsd-elf|qnx|sunos)
-+freebsd-aout|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -7414,8 +7414,8 @@
- ;;
+diff -ur misc/libxslt-1.1.29/configure misc/build/libxslt-1.1.29/configure
+--- misc/libxslt-1.1.29/configure 2016-05-23 18:49:13.0 -0700
misc/build/libxslt-1.1.29/configure2016-08-11 11:06:10.448691000
-0700
+@@ -6691,7 +6691,7 @@
- freebsd-elf)
--major=".$current"
--versuffix=".$current"
-+major=.$(($current - $age))
-+versuffix="$major.$age.$revision"
- ;;
+ cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
- irix | nonstopux)
-diff -ur misc/libxslt-1.1.28/xslt-config.in
misc/build/libxslt-1.1.28/xslt-config.in
misc/libxslt-1.1.28/xslt-config.in 2012-09-04 07:26:23.0 -0700
-+++ misc/build/libxslt-1.1.28/xslt-config.in 2016-03-26 10:54:11.377552000
-0700
+diff -ur misc/libxslt-1.1.29/xslt-config.in
misc/build/libxslt-1.1.29/xslt-config.in
+--- misc/libx
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/pageformatpanel.ui | 38 +- 1 file changed, 7 insertions(+), 31 deletions(-) New commits: commit f8b734a4e2b235c12e86d84c7691e39d05786032 Author: Susobhan Ghosh Date: Fri Aug 12 17:27:02 2016 +0530 tdf#83830 Change 'Margin' to 'Margins' in Page Format Panel Change-Id: I4f47f113705d0841aa1acfc6d273a97843f05ef7 Reviewed-on: https://gerrit.libreoffice.org/28082 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/sw/uiconfig/swriter/ui/pageformatpanel.ui b/sw/uiconfig/swriter/ui/pageformatpanel.ui index 914ede7..232d42c 100644 --- a/sw/uiconfig/swriter/ui/pageformatpanel.ui +++ b/sw/uiconfig/swriter/ui/pageformatpanel.ui @@ -1,8 +1,8 @@ - + - + True False @@ -20,56 +20,48 @@ True False -1 Size: +1 0 0 -1 -1 True False -1 Width: +1 0 1 -1 -1 True False -1 Height: +1 0 2 -1 -1 True False -1 Orientation: +1 0 3 -1 -1 @@ -85,8 +77,6 @@ 1 1 -1 -1 @@ -102,8 +92,6 @@ 1 2 -1 -1 @@ -119,8 +107,6 @@ 1 3 -1 -1 @@ -132,22 +118,18 @@ 1 0 -1 -1 True False +Margins: 1 -Margin: 0 4 -1 -1 @@ -168,8 +150,6 @@ 1 4 -1 -1 @@ -180,8 +160,6 @@ 1 5 -1 -1 @@ -191,8 +169,6 @@ 0 0 -1 -1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/defaultshapespanel.ui |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit e8365711e817876ee45b282fc16977b55f4dbca8 Author: Susobhan Ghosh Date: Fri Aug 12 18:03:37 2016 +0530 Add spacing between shape groups in Default Shapes Panel Change-Id: I6b0b5072fc095fe8c89fe4eba497ed0b7610203c Reviewed-on: https://gerrit.libreoffice.org/28085 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/svx/uiconfig/ui/defaultshapespanel.ui b/svx/uiconfig/ui/defaultshapespanel.ui index 43db7be..aab5fe0 100644 --- a/svx/uiconfig/ui/defaultshapespanel.ui +++ b/svx/uiconfig/ui/defaultshapespanel.ui @@ -1,8 +1,8 @@ - + - + True False @@ -30,6 +30,7 @@ True False vertical +3 True @@ -415,8 +416,6 @@ 0 0 -1 -1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/uibase/uiview/viewtab.cxx | 20 sw/uiconfig/swriter/ui/pageheaderpanel.ui | 73 +- 2 files changed, 42 insertions(+), 51 deletions(-) New commits: commit 6f9f401c94f7381880659a7641396c8173fcce6f Author: Susobhan Ghosh Date: Fri Aug 12 16:22:30 2016 +0530 tdf#83830: Tweaks to page header and footer panels Change-Id: I79b92b39ec1448a662463fb2dcf68fc71509edfb Reviewed-on: https://gerrit.libreoffice.org/28076 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index 4ec6530..9eafba9 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -1028,8 +1028,8 @@ void SwView::ExecTabWin( SfxRequest& rReq ) const SfxInt16Item& aLayoutItem = static_cast(pReqArgs->Get(SID_ATTR_PAGE_HEADER_LAYOUT)); sal_uInt16 nLayout = aLayoutItem.GetValue(); SwPageDesc aDesc(rDesc); -aDesc.ChgHeaderShare((nLayout>>1) == 1); -aDesc.ChgFirstShare((nLayout % 2) == 1); // FIXME control changes for both header footer - tdf#100287 +aDesc.ChgHeaderShare((nLayout>>1) == 0); +aDesc.ChgFirstShare((nLayout % 2) == 0); // FIXME control changes for both header footer - tdf#100287 rSh.ChgPageDesc(rSh.GetCurPageDesc(), aDesc); } } @@ -1081,8 +1081,8 @@ void SwView::ExecTabWin( SfxRequest& rReq ) const SfxInt16Item& aLayoutItem = static_cast(pReqArgs->Get(SID_ATTR_PAGE_FOOTER_LAYOUT)); sal_uInt16 nLayout = aLayoutItem.GetValue(); SwPageDesc aDesc(rDesc); -aDesc.ChgFooterShare((nLayout>>1) == 1); -aDesc.ChgFirstShare((nLayout % 2) == 1); // FIXME control changes for both header footer - tdf#100287 +aDesc.ChgFooterShare((nLayout>>1) == 0); +aDesc.ChgFirstShare((nLayout % 2) == 0); // FIXME control changes for both header footer - tdf#100287 rSh.ChgPageDesc(rSh.GetCurPageDesc(), aDesc); } } @@ -2234,9 +2234,9 @@ void SwView::StateTabWin(SfxItemSet& rSet) SvxLongULSpaceItem aUL( rUL->GetUpper(), rUL->GetLower(), SID_ATTR_PAGE_HEADER_SPACING); rSet.Put(aUL); -bool rShared = rDesc.IsHeaderShared(); -bool rFirst = rDesc.IsFirstShared(); // FIXME control changes for both header footer - tdf#100287 -sal_uInt16 nLayout = ((int)rShared<<1) + (int)rFirst; +bool bShared = !rDesc.IsHeaderShared(); +bool bFirst = !rDesc.IsFirstShared(); // FIXME control changes for both header footer - tdf#100287 +sal_uInt16 nLayout = ((int)bShared<<1) + (int)bFirst; SfxInt16Item aLayoutItem(SID_ATTR_PAGE_HEADER_LAYOUT, nLayout); rSet.Put(aLayoutItem); } @@ -2259,9 +2259,9 @@ void SwView::StateTabWin(SfxItemSet& rSet) SvxLongULSpaceItem aUL( rUL->GetUpper(), rUL->GetLower(), SID_ATTR_PAGE_FOOTER_SPACING); rSet.Put(aUL); -bool rShared = rDesc.IsFooterShared(); -bool rFirst = rDesc.IsFirstShared(); // FIXME control changes for both header footer - tdf#100287 -sal_uInt16 nLayout = ((int)rShared<<1) + (int)rFirst; +bool bShared = !rDesc.IsFooterShared(); +bool bFirst = !rDesc.IsFirstShared(); // FIXME control changes for both header footer - tdf#100287 +sal_uInt16 nLayout = ((int)bShared<<1) + (int)bFirst; SfxInt16Item aLayoutItem(SID_ATTR_PAGE_FOOTER_LAYOUT, nLayout); rSet.Put(aLayoutItem); } diff --git a/sw/uiconfig/swriter/ui/pageheaderpanel.ui b/sw/uiconfig/swriter/ui/pageheaderpanel.ui index cd4d120..90bfb4f 100644 --- a/sw/uiconfig/swriter/ui/pageheaderpanel.ui +++ b/sw/uiconfig/swriter/ui/pageheaderpanel.ui @@ -77,10 +77,12 @@ - + True False -Same Content: +end +True +Margins: False @@ -92,95 +94,84 @@ 0 0 -1 -1 - -True + False -Margins: +Custom -0 -1 -1 -1 +1 +3 True False +end Spacing: 0 -2 -1 -1 +1 - + True False -Set the amount of space bet
