[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 075b5ad5bdd230738ee30b0ea17a7fa9502c218b Author: Olivier Hallot Date: Thu Dec 21 19:22:29 2017 -0200 Updated core Project: help 0e5a56e81f63d2705f1083acda4b2d899783fdcd Relativise wrt file position Now is changed to https://gerrit.libreoffice.org/46932 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index bb3fd71d51c8..0e5a56e81f63 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bb3fd71d51c84aa93df51c9e66d2dc0d1596d1a9 +Subproject commit 0e5a56e81f63d2705f1083acda4b2d899783fdcd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: CustomTarget_html.mk help3xsl/online_transform.xsl
CustomTarget_html.mk |1 help3xsl/online_transform.xsl | 108 -- 2 files changed, 63 insertions(+), 46 deletions(-) New commits: commit 0e5a56e81f63d2705f1083acda4b2d899783fdcd Author: Olivier Hallot Date: Thu Dec 21 19:22:29 2017 -0200 Relativise wrt file position Now is changed to https://gerrit.libreoffice.org/46932 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index 4c45dc44f..85ae29b2a 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -99,7 +99,6 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \ && find text -name "*.xhp" \ | while read xhp; do \ $(call gb_ExternalExecutable_get_command,xsltproc) \ - --stringparam fileTree '/' \ --stringparam Language $* \ --stringparam local $(if $(HELP_ONLINE),'no','yes') \ --stringparam root `pwd`/ \ diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 649671421..1551a2038 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -30,7 +30,6 @@ - @@ -59,7 +58,6 @@ - @@ -113,6 +111,11 @@ + + + + + @@ -299,15 +302,14 @@
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/qa sw/source
sw/qa/extras/uiwriter/data/fdo114306.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 28
sw/source/core/layout/findfrm.cxx| 27 ++-
sw/source/core/layout/flowfrm.cxx|8 ++--
4 files changed, 60 insertions(+), 3 deletions(-)
New commits:
commit 58074678a9a6608a745acef6e61b81ede09cd180
Author: Manfred Blume
Date: Thu Dec 21 21:10:03 2017 +0100
tdf#114306 fix Unexpected page break in long table
Cherry-picked from 18765b9fa739337d2d891513f6e2fb7c3ce23b50
Change-Id: I9a89bb29a1d745c0bc3c46966a60c2f9a484bdd8
diff --git a/sw/qa/extras/uiwriter/data/fdo114306.odt
b/sw/qa/extras/uiwriter/data/fdo114306.odt
new file mode 100755
index ..5a7d2f9ca864
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/fdo114306.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 766ab7199419..afdd8aee20dc 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -206,6 +206,7 @@ public:
void testTdf104814();
void testTdf105417();
void testTdf112025();
+void testTdf114306();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -311,6 +312,7 @@ public:
CPPUNIT_TEST(testTdf104814);
CPPUNIT_TEST(testTdf105417);
CPPUNIT_TEST(testTdf112025);
+CPPUNIT_TEST(testTdf114306);
CPPUNIT_TEST_SUITE_END();
private:
@@ -3784,6 +3786,32 @@ void SwUiWriterTest::testTdf112025()
CPPUNIT_ASSERT_EQUAL(true, getProperty(xStyle, "IsLandscape"));
}
+void SwUiWriterTest::testTdf114306()
+{
+load(DATA_DIRECTORY, "fdo114306.odt");
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+
+xmlDocPtr pXmlDoc = parseLayoutDump();
+xmlXPathObjectPtr pXmlObj;
+xmlNodeSetPtr pXmlNodes;
+int numberOfNodes = 0;
+
+// There are 2 long paragraphs in cell A1.
+// A part of paragraph 2 should flow over to the second page but *not* the
whole paragraph.
+// There should be 2 paragraphs on page 1 and 1 paragraph on page 2.
+pXmlObj = getXPathNode(pXmlDoc,
"/root/page[1]/body/tab[1]/row[1]/cell[1]/txt");
+pXmlNodes = pXmlObj->nodesetval;
+numberOfNodes = xmlXPathNodeSetGetLength(pXmlNodes);
+CPPUNIT_ASSERT_EQUAL(2, numberOfNodes);
+xmlXPathFreeObject(pXmlObj);
+
+pXmlObj = getXPathNode(pXmlDoc,
"/root/page[2]/body/tab[1]/row[1]/cell[1]/txt");
+pXmlNodes = pXmlObj->nodesetval;
+numberOfNodes = xmlXPathNodeSetGetLength(pXmlNodes);
+CPPUNIT_ASSERT_EQUAL(1, numberOfNodes);
+xmlXPathFreeObject(pXmlObj);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/layout/findfrm.cxx
b/sw/source/core/layout/findfrm.cxx
index bac984ba36dc..c33571aaf047 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1298,8 +1298,33 @@ bool SwFrame::IsMoveable( const SwLayoutFrame*
_pLayoutFrame ) const
_pLayoutFrame->IsInDocBody() ||
_pLayoutFrame->IsInFootnote() )
{
+/*
+https://bugs.documentfoundation.org/show_bug.cgi?id=114306
+This method is mostly used like:
+
+if ( && IsMoveable())
+{
+...
+SwFlowFrame::MoveFwd()
+}
+
+or
+
+if ( && IsMoveable())
+{
+...
+SwFlowFrame::MoveBwd()
+}
+
+If IsMovable() is called before a MoveFwd() the method may return
false if there is no NextCellLeaf.
+If IsMovable() is called before a MoveBwd() the method may return
false if there is no PrevCellLeaf.
+
+The patch should make IsMoveable() more symmetric.
+*/
if ( _pLayoutFrame->IsInTab() && !IsTabFrame() &&
- ( !IsContentFrame() ||
!const_cast(this)->GetNextCellLeaf( MAKEPAGE_NONE ) ) )
+ ( !IsContentFrame() ||
(!const_cast(this)->GetNextCellLeaf( MAKEPAGE_NONE )
+ &&
!const_cast(this)->GetPrevCellLeaf( MAKEPAGE_NONE )) )
+)
{
bRetVal = false;
}
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 02bed5f77dfa..779ec657ccda 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2006,11 +2006,15 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
const SwLayoutFrame* pUpperFrame = m_rThis.GetUpper();
while ( pUpperFrame )
{
-if ( pUpperFrame->IsTabFrame() )
+if ( pUpperFrame->IsTabFrame() || pUpperFrame->IsRowFrame() )
{
return false;
}
-if ( pUpperFrame->IsColumnFrame() && pUpperFrame->IsInSct() )
+
+// If the text frame is a follow-in-table, that can move
+
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/data/fdo114306.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 15 +++
sw/source/core/layout/findfrm.cxx|8 +++-
sw/source/core/layout/flowfrm.cxx|9 +++--
4 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50
Author: Manfred Blume
Date: Fri Dec 8 15:01:51 2017 +0100
tdf#114306 fix unexpected page break in row-spanned table
If a para gets moved off to another page, it never gets
moved back. Make IsMoveable() more symmetric, add condition
to MoveBwd to also claim table content back.
Change-Id: I5366eb824f0ef7016599c86cbdf42f65b9b5
Reviewed-on: https://gerrit.libreoffice.org/46021
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/qa/extras/uiwriter/data/fdo114306.odt
b/sw/qa/extras/uiwriter/data/fdo114306.odt
new file mode 100755
index ..5a7d2f9ca864
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/fdo114306.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 6d6469c376d4..256b3ea8077c 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -289,6 +289,7 @@ public:
void testTdf99689TableOfTables();
void testTdf113790();
void testTdf108048();
+void testTdf114306();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -458,6 +459,7 @@ public:
CPPUNIT_TEST(testTdf99689TableOfTables);
CPPUNIT_TEST(testTdf113790);
CPPUNIT_TEST(testTdf108048);
+CPPUNIT_TEST(testTdf114306);
CPPUNIT_TEST_SUITE_END();
private:
@@ -5243,6 +5245,19 @@ void SwUiWriterTest::testTdf112025()
CPPUNIT_ASSERT_EQUAL(true, getProperty(xStyle, "IsLandscape"));
}
+void SwUiWriterTest::testTdf114306()
+{
+load(DATA_DIRECTORY, "fdo114306.odt");
+xmlDocPtr pXmlDoc = parseLayoutDump();
+
+// There are 2 long paragraphs in cell A1.
+// A part of paragraph 2 should flow over to the second page but
+// *not* the whole paragraph. There should be 2 paragraphs on
+// page 1 and 1 paragraph on page 2.
+assertXPath(pXmlDoc, "/root/page[1]/body/tab[1]/row[1]/cell[1]/txt", 2);
+assertXPath(pXmlDoc, "/root/page[2]/body/tab[1]/row[1]/cell[1]/txt", 1);
+}
+
void SwUiWriterTest::testTdf108524()
{
createDoc("tdf108524.odt");
diff --git a/sw/source/core/layout/findfrm.cxx
b/sw/source/core/layout/findfrm.cxx
index 73d4a86c0bce..494920dc6281 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1303,8 +1303,14 @@ bool SwFrame::IsMoveable( const SwLayoutFrame*
_pLayoutFrame ) const
_pLayoutFrame->IsInDocBody() ||
_pLayoutFrame->IsInFootnote() )
{
+// If IsMovable() is called before a MoveFwd() the method
+// may return false if there is no NextCellLeaf. If
+// IsMovable() is called before a MoveBwd() the method may
+// return false if there is no PrevCellLeaf.
if ( _pLayoutFrame->IsInTab() && !IsTabFrame() &&
- ( !IsContentFrame() ||
!const_cast(this)->GetNextCellLeaf() ) )
+ ( !IsContentFrame() ||
(!const_cast(this)->GetNextCellLeaf()
+ &&
!const_cast(this)->GetPrevCellLeaf()) )
+)
{
bRetVal = false;
}
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 83043c78278f..78b78e61b8e9 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2021,14 +2021,19 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
const SwLayoutFrame* pUpperFrame = m_rThis.GetUpper();
while ( pUpperFrame )
{
-if ( pUpperFrame->IsTabFrame() )
+if ( pUpperFrame->IsTabFrame() || pUpperFrame->IsRowFrame() )
{
return false;
}
// If the text frame is a follow-section-in-table, that can move
// backward as well.
bool bIsFollowSection = pUpperFrame->IsSctFrame() &&
static_cast(pUpperFrame)->GetPrecede();
-if ( ( pUpperFrame->IsColumnFrame() && pUpperFrame->IsInSct() ) ||
bIsFollowSection )
+
+// If the text frame is a follow-in-table, that can move
+// backward as well.
+bool bIsFollow =
const_cast(pUpperFrame)->GetPrevCellLeaf();
+
+if ( ( pUpperFrame->IsColumnFrame() && pUpperFrame->IsInSct() ) ||
bIsFollowSection || bIsFollow )
{
break;
}
___
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' - 2 commits - sc/source
sc/source/core/tool/token.cxx | 46 --
1 file changed, 44 insertions(+), 2 deletions(-)
New commits:
commit 16d75204418455c0d9dff13607432dae33a7566e
Author: Eike Rathke
Date: Wed Dec 20 21:32:55 2017 +0100
Invert logic, include only known good, tdf#114251 related
Change-Id: Ic362ad6c35f7f6374fc262029251e48e4f82d778
Reviewed-on: https://gerrit.libreoffice.org/46863
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit b366adcf5aca8bb22ccd0dd270ab08e9c8976b5b)
Reviewed-on: https://gerrit.libreoffice.org/46877
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 396c25537ffb..089ed5b5f48d 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1670,11 +1670,18 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
// All the rest, special commands, separators, error codes, ...
switch (eOp)
{
+default:
+// Default is off, no vectorization.
+// Mentioning some specific values below to indicate why.
+
case ocName:
// Named expression would need "recursive" handling of its
// token array for vector state in
// ScFormulaCell::InterpretFormulaGroup() and below.
+case ocDBArea:
+// Certainly not a vectorization of the entire area..
+
case ocTableRef:
// May result in a single cell or range reference, depending on
// context.
@@ -1692,8 +1699,30 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
mbOpenCLEnabled = false;
CheckForThreading(eOp);
break;
-default:
-; // nothing
+
+// Known good, don't change state.
+case ocStop:
+case ocExternal:
+case ocOpen:
+case ocClose:
+case ocSep:
+case ocArrayOpen:
+case ocArrayRowSep:
+case ocArrayColSep:
+case ocArrayClose:
+case ocMissing:
+case ocBad:
+case ocSpaces:
+case ocSkip:
+case ocPercentSign:
+case ocErrNull:
+case ocErrDivZero:
+case ocErrValue:
+case ocErrRef:
+case ocErrName:
+case ocErrNum:
+case ocErrNA:
+break;
}
}
}
commit 409f32c514a85ac735f82cbf36308c1709b569ec
Author: Eike Rathke
Date: Wed Dec 20 19:44:51 2017 +0100
Exclude more special OpCode values from vectorization
Namely those that have some reference assigned.
Change-Id: Icd5f79612295f13d552a256233b8f1298e3e5359
(cherry picked from commit b34c0cd9ada297e9565b1a93fcaa2a96333e1881)
Reviewed-on: https://gerrit.libreoffice.org/46859
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index aee7f56d8e8f..396c25537ffb 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1674,6 +1674,19 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
// Named expression would need "recursive" handling of its
// token array for vector state in
// ScFormulaCell::InterpretFormulaGroup() and below.
+
+case ocTableRef:
+// May result in a single cell or range reference, depending on
+// context.
+
+case ocColRowName:
+// The associated reference is the name cell with which to
+// create the implicit intersection.
+
+case ocColRowNameAuto:
+// Auto column/row names lead to references computed in
+// interpreter.
+
SAL_INFO("sc.opencl", "opcode " <<
formula::FormulaCompiler().GetOpCodeMap(sheet::FormulaLanguage::ENGLISH)->getSymbol(eOp)
<< " disables vectorisation for formula group");
meVectorState = FormulaVectorDisabledByOpCode;
mbOpenCLEnabled = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa
basic/qa/cppunit/test_vba.cxx |8
basic/qa/vba_tests/log.vb |2 -
basic/qa/vba_tests/mirr.vb | 66 --
basic/qa/vba_tests/monthname.vb |2 -
basic/qa/vba_tests/nper.vb | 60 ---
basic/qa/vba_tests/npv.vb | 65 --
basic/qa/vba_tests/pmt.vb | 68
basic/qa/vba_tests/ppmt.vb | 68
basic/qa/vba_tests/pv.vb| 68
basic/qa/vba_tests/qbcolor.vb |2 -
basic/qa/vba_tests/rate.vb |2 -
basic/qa/vba_tests/rgb.vb |2 -
basic/qa/vba_tests/right.vb |4 --
basic/qa/vba_tests/rtrim.vb |4 --
basic/qa/vba_tests/second.vb|4 --
basic/qa/vba_tests/sgn.vb | 14 +++-
basic/qa/vba_tests/sin.vb |4 --
basic/qa/vba_tests/sln.vb | 62
18 files changed, 15 insertions(+), 490 deletions(-)
New commits:
commit baaf6c12c8e9f785dc91e5d3db8b2f5072d4e3f5
Author: ZdenÄk Crhonek
Date: Sun Dec 3 13:32:44 2017 +0100
VB tests (3)-don't pass whe all tests fail
Change-Id: I7dd99a43a3d41c8ca31a070028a19bd032d06435
Reviewed-on: https://gerrit.libreoffice.org/45739
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index d153a1d62f82..a238337b8953 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -109,24 +109,16 @@ void VBATest::testMiscVBAFunctions()
"ltrim.vb",
"mid.vb",
"minute.vb",
-"mirr.vb",
"month.vb",
"monthname.vb",
"oct.vb",
-"nper.vb",
-"npv.vb",
-"pmt.vb",
-"ppmt.vb",
-"pv.vb",
"qbcolor.vb",
-"rate.vb",
"rgb.vb",
"rtrim.vb",
"right.vb",
"second.vb",
"sgn.vb",
"sin.vb",
-"sln.vb",
"space.vb",
"sqr.vb",
"str.vb",
diff --git a/basic/qa/vba_tests/log.vb b/basic/qa/vba_tests/log.vb
index 675798bc1a72..08656bdf59c1 100644
--- a/basic/qa/vba_tests/log.vb
+++ b/basic/qa/vba_tests/log.vb
@@ -6,7 +6,7 @@ Dim result As String
Function doUnitTest() As String
result = verify_testLog()
-If failCount <> 0 And passCount > 0 Then
+If failCount <> 0 or passCount = 0 Then
doUnitTest = result
Else
doUnitTest = "OK"
diff --git a/basic/qa/vba_tests/mirr.vb b/basic/qa/vba_tests/mirr.vb
deleted file mode 100644
index ebf35ea3b0e8..
--- a/basic/qa/vba_tests/mirr.vb
+++ /dev/null
@@ -1,66 +0,0 @@
-Option VBASupport 1
-Option Explicit
-Dim passCount As Integer
-Dim failCount As Integer
-Dim result As String
-
-Function doUnitTest() As String
-result = verify_testMIRR()
-If failCount <> 0 And passCount > 0 Then
-doUnitTest = result
-Else
-doUnitTest = "OK"
-End If
-End Function
-
-
-
-Function verify_testMIRR() As String
-
-passCount = 0
-failCount = 0
-
-result = "Test Results" & Chr$(10) & "" & Chr$(10)
-
-Dim testName As String
-Dim date1, date2, LoanAPR, InvAPR, Fmt, RetRate, Msg
-testName = "Test MIRR function"
-On Error GoTo errorHandler
-
-Static Values(5) As Double' Set up array.
-LoanAPR = 0.1 ' Loan rate.
-InvAPR = 0.12 ' Reinvestment rate.
-Values(0) = -7' Business start-up costs.
-Values(1) = 22000: Values(2) = 25000
-Values(3) = 28000: Values(4) = 31000
-date2 = 0.148
-date1 = MIRR(Values(), LoanAPR, InvAPR)
-TestLog_ASSERT Round(date1, 3) = Round(date2, 3), "the return MIRR is: " &
date1
-
-result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
-verify_testMIRR = result
-
-Exit Function
-errorHandler:
-TestLog_ASSERT (False), testName & ": hit error handler"
-End Function
-
-Sub TestLog_ASSERT(assertion As Boolean, Optional testId As String, Optional
testComment As String)
-
-If assertion = True Then
-passCount = passCount + 1
-Else
-Dim testMsg As String
-If Not IsMissing(testId) Then
-testMsg = testMsg + " : " + testId
-End If
-If Not IsMissing(testComment) And Not (testComment = "") Then
-testMsg = testMsg + " (" + testComment + ")"
-End If
-
-result = result & Chr$(10) & " Failed: " & testMsg
-failCount = failCount + 1
-End If
-
-End Sub
-
diff --git a/basic/qa/vba_tests/monthname.vb b/basic/qa/vba_tests/monthname.vb
index fe90f14dba01..627f9095b036 100644
--- a/basic/qa/vba_tests/monthname.vb
+++ b/basic/qa/vba_tests/monthname.vb
@@ -6,7 +6,7 @@ Dim result As String
Function doUnitTest() As String
result = verify_testMonthName()
-If failCount <> 0 And passCount > 0 Then
+If failCount <> 0 or passCo
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx | 26 --
1 file changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 8f3f6755d7f7355493e873954513fdaeb4dceca9
Author: Eike Rathke
Date: Thu Dec 21 23:41:16 2017 +0100
Have one getSkipEmptyCellsIndex(), assert array length, tdf#113979 follow-up
Change-Id: Iac38405ac7d246dfe13766b1eefc6310756bffe6
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 69cfdc65324a..4340244a0706 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -84,6 +84,13 @@ const OUString aSep_Path =
"Office.Calc/Dialogs/CSVImport";
const OUString aSep_Path_Clpbrd ="Office.Calc/Dialogs/ClipboardTextImport";
const OUString aSep_Path_Text2Col = "Office.Calc/Dialogs/TextToColumnsImport";
+namespace {
+CSVImportOptionsIndex getSkipEmptyCellsIndex( ScImportAsciiCall eCall )
+{
+return eCall == SC_TEXTTOCOLUMNS ? CSVIO_Text2ColSkipEmptyCells :
CSVIO_PasteSkipEmptyCells;
+}
+}
+
static void lcl_FillCombo( ComboBox& rCombo, const OUString& rList,
sal_Unicode cSelect )
{
sal_Int32 i;
@@ -165,9 +172,9 @@ void lcl_CreatePropertiesNames ( OUString& rSepPath,
Sequence& rNames,
}
if (eCall != SC_IMPORTFILE)
{
-pNames[ eCall == SC_TEXTTOCOLUMNS ?
-CSVIO_Text2ColSkipEmptyCells :
-CSVIO_PasteSkipEmptyCells ] = CSVImportOptionNames[
CSVIO_PasteSkipEmptyCells ];
+const sal_Int32 nSkipEmptyCells = getSkipEmptyCellsIndex(eCall);
+assert( nSkipEmptyCells < rNames.getLength());
+pNames[ nSkipEmptyCells ] = CSVImportOptionNames[
CSVIO_PasteSkipEmptyCells ];
}
}
@@ -216,10 +223,9 @@ static void lcl_LoadSeparators( OUString&
rFieldSeparators, OUString& rTextSepar
}
if (eCall != SC_IMPORTFILE)
{
-sal_Int32 nSkipEmptyCells = eCall == SC_TEXTTOCOLUMNS ?
-CSVIO_Text2ColSkipEmptyCells :
-CSVIO_PasteSkipEmptyCells;
-if( pProperties[nSkipEmptyCells].hasValue() )
+const sal_Int32 nSkipEmptyCells = getSkipEmptyCellsIndex(eCall);
+assert( nSkipEmptyCells < aValues.getLength());
+if ( pProperties[nSkipEmptyCells].hasValue() )
rSkipEmptyCells = ScUnoHelpFunctions::GetBoolFromAny(
pProperties[nSkipEmptyCells] );
}
}
@@ -254,9 +260,9 @@ static void lcl_SaveSeparators(
}
if (eCall != SC_IMPORTFILE)
{
-pProperties[ eCall == SC_TEXTTOCOLUMNS ?
-CSVIO_Text2ColSkipEmptyCells :
-CSVIO_PasteSkipEmptyCells ] <<=
bSkipEmptyCells;
+const sal_Int32 nSkipEmptyCells = getSkipEmptyCellsIndex(eCall);
+assert( nSkipEmptyCells < aValues.getLength());
+pProperties[ nSkipEmptyCells ] <<= bSkipEmptyCells;
}
aItem.PutProperties(aNames, aValues);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 + sw/uiconfig/swriter/menubar/menubar.xml |9 - 2 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 993bbae2d43d3e4dea445cccbee3bb16d883af02 Author: Yousuf Philips Date: Thu Dec 21 01:11:01 2017 +0400 tdf#91781 Writer: Add Breaks submenu in Insert menu Change-Id: I6d143aa058bce731493e3f90fe361ee2a0d257f9 Reviewed-on: https://gerrit.libreoffice.org/46865 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index e814b4f64fd3..09e73efd9241 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -6492,6 +6492,11 @@ Navigate + + + More Breaks + + diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index df2a37ae796b..cfcc9cd1b908 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -231,7 +231,14 @@ - + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/source sc/uiconfig
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 14
sc/source/ui/dbgui/scuiasciiopt.cxx | 235 ---
sc/source/ui/docshell/impex.cxx | 21 -
sc/source/ui/inc/asciiopt.hxx|3
sc/source/ui/inc/scuiasciiopt.hxx|1
sc/uiconfig/scalc/ui/textimportcsv.ui| 18 +
6 files changed, 185 insertions(+), 107 deletions(-)
New commits:
commit 3bd4957191f12457c17404645bab0794639c95f8
Author: Laurent BP
Date: Sun Dec 17 17:14:55 2017 +0100
tdf#113979 Add option to Skip empty cells
During "Txt to column", empty cells should erase previous content
(see tdf#69981)
But during paste, user may want to keep previous content.
This option makes all users happy.
During import of CSV file, this option is hidden.
In the same time, I've tried to remove some duplicate code.
Update: properties offsets are now enum and replace define const
Change-Id: I88be2d0432ff804033cff050422e666fa2882efd
Reviewed-on: https://gerrit.libreoffice.org/46651
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 42d535a6a795..2d5e7a8696e0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1177,6 +1177,13 @@
true
+
+
+If true, Calc preserves previous content of cells when
pasting empty ones. If false, Calc delete content of previous cells.
+SkipEmptyCells
+
+ true
+
Language to use for CSV import. This determines how the
numbers are parsed.
@@ -1245,6 +1252,13 @@
+
+
+If true, Calc preserves previous content of cells when
pasting empty ones. If false, Calc delete content of previous cells.
+SkipEmptyCells
+
+ false
+
Text Separators
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index ec3604fde5c7..69cfdc65324a 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -52,18 +52,37 @@ const SCSIZE ASCIIDLG_MAXROWS= MAXROWCOUNT;
using namespace com::sun::star::uno;
// Defines - CSV Import Preserve Options
-#define FIXED_WIDTH "FixedWidth"
-#define FROM_ROW"FromRow"
-#define CHAR_SET"CharSet"
-#define SEPARATORS "Separators"
-#define TEXT_SEPARATORS "TextSeparators"
-#define MERGE_DELIMITERS"MergeDelimiters"
-#define QUOTED_AS_TEXT "QuotedFieldAsText"
-#define DETECT_SPECIAL_NUM "DetectSpecialNumbers"
-#define LANGUAGE"Language"
-#define SEP_PATH"Office.Calc/Dialogs/CSVImport"
-#define SEP_PATH_CLPBRD "Office.Calc/Dialogs/ClipboardTextImport"
-#define SEP_PATH_TEXT2COL "Office.Calc/Dialogs/TextToColumnsImport"
+enum CSVImportOptionsIndex
+{
+CSVIO_MergeDelimiters = 0,
+CSVIO_Separators,
+CSVIO_TextSeparators,
+CSVIO_FixedWidth,
+CSVIO_FromRow,
+CSVIO_Text2ColSkipEmptyCells = CSVIO_FromRow,
+CSVIO_CharSet,
+CSVIO_QuotedAsText,
+CSVIO_DetectSpecialNum,
+CSVIO_Language,
+CSVIO_PasteSkipEmptyCells
+};
+
+const ::std::vector CSVImportOptionNames =
+{
+"MergeDelimiters",
+"Separators",
+"TextSeparators",
+"FixedWidth",
+"FromRow",
+"CharSet",
+"QuotedFieldAsText",
+"DetectSpecialNumbers",
+"Language",
+"SkipEmptyCells"
+};
+const OUString aSep_Path = "Office.Calc/Dialogs/CSVImport";
+const OUString aSep_Path_Clpbrd ="Office.Calc/Dialogs/ClipboardTextImport";
+const OUString aSep_Path_Text2Col = "Office.Calc/Dialogs/TextToColumnsImport";
static void lcl_FillCombo( ComboBox& rCombo, const OUString& rList,
sal_Unicode cSelect )
{
@@ -110,129 +129,134 @@ static sal_Unicode lcl_CharFromCombo( const ComboBox&
rCombo, const OUString& rL
return c;
}
-static void load_Separators( OUString &sFieldSeparators, OUString
&sTextSeparators,
- bool &bMergeDelimiters, bool& bQuotedAsText,
bool& bDetectSpecialNum,
- bool &bFixedWidth, sal_Int32 &nFromRow, sal_Int32
&nCharSet,
- sal_Int32& nLanguage, ScImportAsciiCall eCall )
+void lcl_CreatePropertiesNames ( OUString& rSepPath, Sequence&
rNames, ScImportAsciiCall eCall )
{
-SequenceaValues;
-const Any *pProperties;
-Sequence aNames( eCall == SC_TEXTTOCOLUMNS ? 4 : 9 );
-OUString* pNames = aNames.getArray();
-OUString aSepPath;
+sal_Int32 nProperties = 0;
+
switch(eCall)
{
case SC_IMPORTFILE:
-
[Libreoffice-commits] online.git: loleaflet/po
loleaflet/po/styles/af.po |4 loleaflet/po/styles/am.po |4 loleaflet/po/styles/ar.po |4 loleaflet/po/styles/as.po |4 loleaflet/po/styles/ast.po |4 loleaflet/po/styles/be.po |4 loleaflet/po/styles/bg.po |4 loleaflet/po/styles/bn-IN.po |4 loleaflet/po/styles/bn.po |4 loleaflet/po/styles/bo.po |4 loleaflet/po/styles/br.po |4 loleaflet/po/styles/bs.po |4 loleaflet/po/styles/ca-valencia.po |4 loleaflet/po/styles/ca.po |4 loleaflet/po/styles/cs.po |4 loleaflet/po/styles/cy.po |4 loleaflet/po/styles/da.po |4 loleaflet/po/styles/de.po |4 loleaflet/po/styles/dgo.po |4 loleaflet/po/styles/dz.po |4 loleaflet/po/styles/el.po |4 loleaflet/po/styles/eo.po |4 loleaflet/po/styles/es.po |4 loleaflet/po/styles/et.po |4 loleaflet/po/styles/eu.po |4 loleaflet/po/styles/fa.po |4 loleaflet/po/styles/fi.po |4 loleaflet/po/styles/fr.po |4 loleaflet/po/styles/ga.po |4 loleaflet/po/styles/gd.po |4 loleaflet/po/styles/gl.po |4 loleaflet/po/styles/gu.po |4 loleaflet/po/styles/gug.po |4 loleaflet/po/styles/he.po |4 loleaflet/po/styles/hi.po |4 loleaflet/po/styles/hr.po |4 loleaflet/po/styles/hu.po |4 loleaflet/po/styles/id.po |4 loleaflet/po/styles/is.po |4 loleaflet/po/styles/it.po |4 loleaflet/po/styles/ja.po |4 loleaflet/po/styles/kk.po |4 loleaflet/po/styles/km.po |4 loleaflet/po/styles/kmr-Latn.po|4 loleaflet/po/styles/kn.po |4 loleaflet/po/styles/ko.po |4 loleaflet/po/styles/lb.po |4 loleaflet/po/styles/lt.po |4 loleaflet/po/styles/lv.po |4 loleaflet/po/styles/mk.po |4 loleaflet/po/styles/ml.po |4 loleaflet/po/styles/mn.po |4 loleaflet/po/styles/mr.po |4 loleaflet/po/styles/my.po |4 loleaflet/po/styles/nb.po |4 loleaflet/po/styles/ne.po |4 loleaflet/po/styles/nl.po |4 loleaflet/po/styles/nn.po |4 loleaflet/po/styles/nso.po |4 loleaflet/po/styles/oc.po |4 loleaflet/po/styles/om.po |4 loleaflet/po/styles/or.po |4 loleaflet/po/styles/pa-IN.po |4 loleaflet/po/styles/pl.po |4 loleaflet/po/styles/pt-BR.po |4 loleaflet/po/styles/pt.po |4 loleaflet/po/styles/ro.po |4 loleaflet/po/styles/ru.po |4 loleaflet/po/styles/sa-IN.po |4 loleaflet/po/styles/sat.po |4 loleaflet/po/styles/sd.po |4 loleaflet/po/styles/si.po |4 loleaflet/po/styles/sid.po |4 loleaflet/po/styles/sk.po |4 loleaflet/po/styles/sl.po |4 loleaflet/po/styles/sq.po |4 loleaflet/po/styles/sr-Latn.po |4 loleaflet/po/styles/sr.po |4 loleaflet/po/styles/sv.po |4 loleaflet/po/styles/ta.po |4 loleaflet/po/styles/te.po |4 loleaflet/po/styles/th.po |4 loleaflet/po/styles/tr.po |4 loleaflet/po/styles/ug.po |4 loleaflet/po/styles/uk.po |4 loleaflet/po/styles/uz.po |4 loleaflet/po/styles/vi.po |4 loleaflet/po/styles/zh-CN.po |4 loleaflet/po/styles/zh-TW.po |4 loleaflet/po/styles/zu.po |4 90 files changed, 360 insertions(+) New commits: commit 6b764c79faf06b755ca7a7ab029815cf8c5fe947 Author: Andras Timar Date: Sat Dec 16 10:08:31 2017 +0100 Add translations for 'None (Do not check spelling)' Change-Id: I6bf4b548ae34f3358b99ce639d6ac4d5fca89834 Reviewed-on: https://gerrit.libreoffice.org/46933 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/po/styles/af.po b/loleaflet/po/styles/af.po index 11647381..f7d5bb10 100644 --- a/loleaflet/po/styles/af.po +++ b/loleaflet/po/styles/af.po @@ -3066,3 +3066,7 @@ msgstr "Sorbies, Bo" #: langtab.src msgid "Sorbian, Lower" msgstr "Sorbies, Onder" + +#: resource
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/qa sw/source
sw/qa/complex/writer/TextPortionEnumerationTest.java | 21 ++-
sw/source/core/unocore/unoportenum.cxx | 111 ---
2 files changed, 112 insertions(+), 20 deletions(-)
New commits:
commit 1252375ec742eb5f0a8b134704bdece14d541b42
Author: Miklos Vajna
Date: Thu Dec 21 09:32:13 2017 +0100
sw: fix inconsistent bookmark behavior around at-char/as-char anchored
frames
We have a placeholder character in the sw doc model for as-char anchored
frames, so it's possible to have a bookmark before/after the frame or a
non-collapsed bookmark which covers the frame.
The same is not true for at-char anchored frames, where the anchor
points to a doc model position, but there is no placeholder character.
If a bookmark is created covering the start and end of the anchor of the
frame, internally we create a collapsed bookmark which has the same
position as the anchor of the frame. When this doc model is handled by
SwXParagraph::createEnumeration(), first the frame and then the bookmark
is appended to the text portion enumeration, so your bookmark around the
frame is turned into a collapsed bookmark after the frame. (The same
happens when we roundtrip an ODT document representing this doc model.)
Fix the problem by inserting collapsed bookmarks with affected anchor
positions (same position is the anchor for an at-char frame) into the
enumeration in two stages: first the start of them before frames and
then the end of them + other bookmarks. This way UNO API users get their
non-collapsed bookmarks around at-char anchored frames, similar to
as-char ones.
(cherry picked from commit 76a4305d1e90b6617054dd33036e64f005dbcf04)
Conflicts:
sw/qa/python/text_portion_enumeration_test.py
sw/source/core/unocore/unoportenum.cxx
Change-Id: Ic1f173c85d3824afabb5b7ebf3a8594311eb9007
Reviewed-on: https://gerrit.libreoffice.org/46924
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java
b/sw/qa/complex/writer/TextPortionEnumerationTest.java
index e36fc650b500..39af83862f17 100644
--- a/sw/qa/complex/writer/TextPortionEnumerationTest.java
+++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java
@@ -1841,8 +1841,9 @@ public class TextPortionEnumerationTest
String name5 = mkName("frame");
TreeNode root = new TreeNode();
root.appendChild( new TextNode("abc") );
-root.appendChild( new BookmarkNode(name1) );
+root.appendChild( new BookmarkStartNode(name1) );
root.appendChild( new FrameNode(name2, AT_CHARACTER) );
+root.appendChild( new BookmarkEndNode(name1) );
root.appendChild( new ReferenceMarkNode(name3) );
root.appendChild( new FrameNode(name4, AT_CHARACTER) );
root.appendChild( new FrameNode(name5, AT_CHARACTER) );
@@ -1899,12 +1900,14 @@ public class TextPortionEnumerationTest
TreeNode root = new TreeNode();
root.appendChild( new ReferenceMarkNode(name1) );
root.appendChild( new DocumentIndexMarkNode(name2) );
-root.appendChild( new BookmarkNode(name3) );
+root.appendChild( new BookmarkStartNode(name3) );
root.appendChild( new FrameNode(name4, AT_CHARACTER) );
+root.appendChild( new BookmarkEndNode(name3) );
root.appendChild( new ReferenceMarkNode(name7) );
root.appendChild( new DocumentIndexMarkNode(name8) );
-root.appendChild( new BookmarkNode(name9) );
+root.appendChild( new BookmarkStartNode(name9) );
root.appendChild( new FrameNode(nameA, AT_CHARACTER) );
+root.appendChild( new BookmarkEndNode(name9) );
doTest(root);
}
@@ -1915,10 +1918,12 @@ public class TextPortionEnumerationTest
String name9 = mkName("bookmark");
String nameA = mkName("frame");
TreeNode root = new TreeNode();
-root.appendChild( new BookmarkNode(name3) );
+root.appendChild( new BookmarkStartNode(name3) );
root.appendChild( new FrameNode(name4, AT_CHARACTER) );
-root.appendChild( new BookmarkNode(name9) );
+root.appendChild( new BookmarkEndNode(name3) );
+root.appendChild( new BookmarkStartNode(name9) );
root.appendChild( new FrameNode(nameA, AT_CHARACTER) );
+root.appendChild( new BookmarkEndNode(name9) );
doTest(root);
}
@@ -1937,8 +1942,9 @@ public class TextPortionEnumerationTest
TreeNode root = new TreeNode();
root.appendChild( new ReferenceMarkNode(name1) );
root.appendChild( new DocumentIndexMarkNode(name2) );
-root.appendChild( new BookmarkNode(name3) );
+root.appendChild( new BookmarkStartNode(name3) );
root.appendChild( new FrameNode(name4, AT_CHARACTER) );
+root.appendChild( new BookmarkEndNode(name3) );
/* currently
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - desktop/source include/LibreOfficeKit include/sfx2 libreofficekit/Executable_gtktiledviewer.mk libreofficekit/qa libreofficekit/source sfx2/s
desktop/source/lib/init.cxx | 285 -- include/LibreOfficeKit/LibreOfficeKit.h | 42 - include/LibreOfficeKit/LibreOfficeKit.hxx | 105 --- include/LibreOfficeKit/LibreOfficeKitEnums.h| 23 include/sfx2/lokhelper.hxx |7 libreofficekit/Executable_gtktiledviewer.mk |5 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 60 -- libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx |8 libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx| 19 libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx|2 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx | 87 --- libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.hxx |2 libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 26 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx| 35 - libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx|2 libreofficekit/qa/gtktiledviewer/gtv.ui | 17 libreofficekit/source/gtk/lokdocview.cxx| 99 +-- sfx2/source/view/lokhelper.cxx | 46 - sw/inc/unotxdoc.hxx | 20 sw/source/uibase/uno/unotxdoc.cxx | 194 -- 20 files changed, 31 insertions(+), 1053 deletions(-) New commits: commit 9364ae836e6975da64abf87eb7c2b02e601e69db Author: Jan Holesovsky Date: Thu Dec 21 13:00:31 2017 +0100 Revert the incomplete dialog tunneling, the API has changed completely. Change-Id: I50fb8c83365cefb8c8e76096fe257d31970a68b4 Reviewed-on: https://gerrit.libreoffice.org/46927 Tested-by: Jenkins Reviewed-by: Michael Meeks diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 5d0e39c419cc..9e0dc77ff681 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -83,7 +83,6 @@ #include #include #include -#include #include #include #include @@ -543,11 +542,6 @@ static void doc_postKeyEvent(LibreOfficeKitDocument* pThis, int nType, int nCharCode, int nKeyCode); -static void doc_postDialogKeyEvent(LibreOfficeKitDocument* pThis, - const char* pDialogId, - int nType, - int nCharCode, - int nKeyCode); static void doc_postMouseEvent (LibreOfficeKitDocument* pThis, int nType, int nX, @@ -555,22 +549,6 @@ static void doc_postMouseEvent (LibreOfficeKitDocument* pThis, int nCount, int nButtons, int nModifier); -static void doc_postDialogMouseEvent (LibreOfficeKitDocument* pThis, - const char* pDialogId, - int nType, - int nX, - int nY, - int nCount, - int nButtons, - int nModifier); -static void doc_postDialogChildMouseEvent (LibreOfficeKitDocument* pThis, - const char* pDialogId, - int nType, - int nX, - int nY, - int nCount, - int nButtons, - int nModifier); static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pCommand, const char* pArguments, @@ -611,15 +589,6 @@ static unsigned char* doc_renderFont(LibreOfficeKitDocument* pThis, int* pFontHeight); static char* doc_getPartHash(LibreOfficeKitDocument* pThis, int nPart); -static void doc_paintDialog(LibreOfficeKitDocument* pThis, const char* pDialogId, unsigned char* pBuffer, -const int nX, const int nY, -const int nWidth, const int nHeight); - -static void doc_getDialogInfo(LibreOfficeKitDocument* pThis, const char* pDialogId, - char** pDialogTitle, int* nWidth, int* nHeight); - -static void doc_paintActiveFloatingWindow(LibreOfficeKitDocument* pThis, const char* pDialogId, unsigned char* pBuffer, int* nWidth, int* nHeight); - LibLODocumen
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |4 Repository.mk |4 download.lst|8 external/more_fonts/ExternalPackage_amiri.mk| 20 external/more_fonts/ExternalPackage_kacst.mk| 17 + external/more_fonts/ExternalPackage_reem.mk | 16 external/more_fonts/ExternalPackage_scheherazade.mk | 17 + external/more_fonts/Module_more_fonts.mk|8 external/more_fonts/UnpackedTarball_amiri.mk| 14 ++ external/more_fonts/UnpackedTarball_kacst.mk| 14 ++ external/more_fonts/UnpackedTarball_reem.mk | 14 ++ external/more_fonts/UnpackedTarball_scheherazade.mk | 14 ++ 12 files changed, 150 insertions(+) New commits: commit 4eaeb8058d75d03e782d37b430b68890aa374f2c Author: Yousuf Philips Date: Thu Dec 21 18:57:02 2017 +0400 tdf#113532 Add Arabic fonts into default installation Includes these fonts * Amiri * KACSTOffice, KACSTBook * Reem Kufi * Scheherazade Change-Id: I2071c4c379b2dc88a205e2c284ae0a65cfdc76c9 Reviewed-on: https://gerrit.libreoffice.org/46624 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/Makefile.fetch b/Makefile.fetch index 33558239eeb8..42a8ca8684f9 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -180,6 +180,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index cc540ef4139e..29a6dbc05a3d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -956,19 +956,23 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ postprocess_fontconfig) \ $(call gb_Helper_optional,MORE_FONTS,\ fonts_alef \ + fonts_amiri \ fonts_caladea \ fonts_carlito \ fonts_culmus \ fonts_dejavu \ fonts_emojione_color \ fonts_gentium \ + fonts_kacst \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ fonts_libre_hebrew \ fonts_noto \ + fonts_reem \ fonts_sourcecode \ fonts_sourcesans \ + fonts_scheherazade \ ) \ )) diff --git a/download.lst b/download.lst index 21c99fe3082b..81d48e94c356 100644 --- a/download.lst +++ b/download.lst @@ -76,6 +76,14 @@ export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725 export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz export FONT_ALEF_SHA256SUM := b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 export FONT_ALEF_TARBALL := alef-1.001.tar.gz +export FONT_AMIRI_SHA256SUM := 97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6 +export FONT_AMIRI_TARBALL := amiri-0.109.zip +export FONT_KACST_SHA256SUM := dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 +export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz +export FONT_REEM_SHA256SUM := 4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b +export FONT_REEM_TARBALL := ReemKufi-0.6.tar.gz +export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 +export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 diff --git a/external/more_fonts/ExternalPackage_amiri.mk b/external/more_fonts/ExternalPackage_amiri.mk new file mode 100644 index ..ccf5f1c94c8a --- /dev/null +++ b/external/more_fonts/ExternalPackage_amiri.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a c
[Libreoffice-commits] core.git: bin/find-unused-sid-commands.py starmath/inc starmath/sdi starmath/source
bin/find-unused-sid-commands.py |4 ++
starmath/inc/starmath.hrc |3 --
starmath/sdi/smath.sdi | 56
starmath/sdi/smslots.sdi| 18
starmath/source/document.cxx|8 -
starmath/source/view.cxx|5 ---
6 files changed, 3 insertions(+), 91 deletions(-)
New commits:
commit b9c6f2de8bdcdcb95fb4f0457ee2fd0e1c42eb5b
Author: Noel Grandin
Date: Thu Dec 21 13:05:54 2017 +0200
unused SID command in starmath
Change-Id: I08c09814a6a29286342fd7dc6a30ca0b6395463e
Reviewed-on: https://gerrit.libreoffice.org/46909
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/bin/find-unused-sid-commands.py b/bin/find-unused-sid-commands.py
index 32f45e0f810a..c0e934b0b624 100755
--- a/bin/find-unused-sid-commands.py
+++ b/bin/find-unused-sid-commands.py
@@ -42,10 +42,12 @@ for pair in commandSet:
for line2 in txt2:
foundLines = foundLines + line2
if foundLines.find("ExecuteList") != -1: continue
-if foundLines.find("GetDispatcher()->Execute") != -1: continue
+if foundLines.find("Dispatcher()->Execute") != -1: continue
if foundLines.find("ExecuteScenarioSlot") != -1: continue
# TODO not sure about this, but let's tackle the easy ones first
if foundLines.find("Invalidate(") != -1: continue
+if foundLines.find("SFX_IMPL_DOCKINGWINDOW_WITHID") != -1: continue
+
# dump any lines that contain the SID, so we can eyeball the results
print("remove: " + commandName)
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index bbe606badee7..0a7c6d003278 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -49,8 +49,6 @@
/** Command for inserting a math construction */
#define SID_INSERTCOMMANDTEXT (SID_SMA_START + 106)
-#define SID_LOADSYMBOLS (SID_SMA_START + 107)
-#define SID_SAVESYMBOLS (SID_SMA_START + 108)
#define SID_MODIFYSTATUS(SID_SMA_START + 110)
#define SID_TEXTSTATUS (SID_SMA_START + 111)
@@ -64,7 +62,6 @@
#define SID_PASTEOBJECT (SID_SMA_START + 118)
#define SID_AUTOREDRAW (SID_SMA_START + 119)
-#define SID_GETEDITTEXT (SID_SMA_START + 121)
#define SID_CMDBOXWINDOW(SID_SMA_START + 122)
#define SID_NO_RIGHT_SPACES (SID_SMA_START + 124)
#define SID_SAVE_ONLY_USED_SYMBOLS (SID_SMA_START + 125)
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index 0ee7306938ca..761cae2c0b0d 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -289,25 +289,6 @@ SfxVoidItem ImportMathMLClipboard
SID_IMPORT_MATHML_CLIPBOARD
GroupId = SfxGroupId::Insert;
]
-SfxVoidItem LoadSymbols SID_LOADSYMBOLS
-()
-[
-AutoUpdate = FALSE,
-FastCall = FALSE,
-ReadOnlyDoc = TRUE,
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-Asynchron;
-
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = SfxGroupId::Options;
-]
-
-
SfxStringItem ModifyStatus SID_MODIFYSTATUS
[
@@ -435,43 +416,6 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW
GroupId = SfxGroupId::View;
]
-
-SfxVoidItem SaveSymbols SID_SAVESYMBOLS
-()
-[
-AutoUpdate = FALSE,
-FastCall = FALSE,
-ReadOnlyDoc = TRUE,
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = SfxGroupId::Options;
-]
-
-
-SfxVoidItem SetPaperSize SID_GETEDITTEXT
-()
-[
-AutoUpdate = FALSE,
-FastCall = FALSE,
-ReadOnlyDoc = TRUE,
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = SfxGroupId::Math;
-]
-
-
SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE
()
[
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 3b0d5cfc6265..d2e49127017c 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -55,18 +55,6 @@ interface FormulaDocument
ExecMethod = Execute ;
StateMethod = GetState ;
]
-//idlpp no menu entry, so no texts
-SID_LOADSYMBOLS //idlpp ole : no , status : no
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
-//idlpp no menu entry, so no texts
-SID_SAVESYMBOLS //idlpp ole : no , status : no
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
SID_FONT //idlpp ole : no , status : no
[
ExecMethod = Execute ;
@@ -257,12 +245,6 @@ interface FormulaView
StateMethod = GetState ;
]
//idlpp no menu entry, so no texts
-SID_GETEDITTEXT //idlpp ole : no , status : no
-[
-ExecMethod = Execute ;
-StateMethod = GetState ;
-]
-//idlpp no menu entry
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sd/inc sd/sdi sd/source sfx2/sdi sfx2/source
include/sfx2/sfxsids.hrc | 21 - sd/inc/app.hrc | 42 -- sd/sdi/ViewShellBase.sdi |9 sd/sdi/_drvwsh.sdi | 123 - sd/sdi/drviewsh.sdi| 10 sd/sdi/sdraw.sdi | 554 -- sd/source/ui/view/GraphicViewShellBase.cxx |2 sd/source/ui/view/ViewShellBase.cxx| 13 sd/source/ui/view/drviews2.cxx | 24 - sd/source/ui/view/drviews6.cxx |3 sd/source/ui/view/drviews9.cxx | 603 - sd/source/ui/view/drviewsa.cxx |6 sd/source/ui/view/drviewse.cxx |7 sfx2/sdi/appslots.sdi | 36 - sfx2/sdi/docslots.sdi | 38 - sfx2/sdi/frmslots.sdi | 31 - sfx2/sdi/sfx.sdi | 378 -- sfx2/sdi/viwslots.sdi |5 sfx2/source/appl/appserv.cxx | 101 sfx2/source/doc/objserv.cxx| 61 -- sfx2/source/view/viewfrm.cxx |4 sfx2/source/view/viewfrm2.cxx | 48 -- sfx2/source/view/viewsh.cxx|2 23 files changed, 14 insertions(+), 2107 deletions(-) New commits: commit 08f4ecd5823c420bb7157c238460d50f1f1f9791 Author: Noel Grandin Date: Thu Dec 21 13:05:42 2017 +0200 unused SID command in sfx2 Change-Id: Ib11b2fb8d922cf522cc28d86082036b75002ba87 Reviewed-on: https://gerrit.libreoffice.org/46908 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 995f3641a744..b234ef92a445 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -103,9 +103,7 @@ #define SID_SAVEACOPY (SID_SFX_START + 999) #define SID_SAVEACOPYITEM (SID_SFX_START + 998) #define SID_CONVERT_IMAGES (SID_SFX_START + 997) -#define SID_CLOSING (SID_SFX_START +1539) #define SID_CLOSEDOC(SID_SFX_START + 503) -#define SID_CLOSEDOCS (SID_SFX_START + 595) #define SID_CLOSEDOC_SAVE (SID_SFX_START + 1) #define SID_CLOSEDOC_FILENAME (SID_SFX_START + 2) #define SID_PRINTDOC(SID_SFX_START + 504) @@ -144,7 +142,6 @@ // browse-ids #define SID_BROWSE_FORWARD (SID_SFX_START + 1300) #define SID_BROWSE_BACKWARD (SID_SFX_START + 1301) -#define SID_CREATELINK (SID_SFX_START + 1309) #define SID_EDITDOC (SID_SFX_START + 1312) #define SID_BROWSER_MODE(SID_SFX_START + 1313) #define SID_READONLYDOC (SID_SFX_START + 1314) @@ -175,7 +172,6 @@ #define SID_DOCUMENT_COMPARE(SID_SFX_START + 1586) #define SID_DOCUMENT_MERGE (SID_SFX_START + 1587) -#define SID_OFFICE_CHECK_PLZ(SID_SFX_START + 1610) #define SID_CURRENT_URL (SID_SFX_START + 1613) #define SID_CHARSET (SID_SFX_START + 1633) @@ -183,7 +179,6 @@ // FREE (was: SID_CRASH) #define SID_FAIL_ON_WARNING (SID_SFX_START + 1646) #define SID_INPUTSTREAM (SID_SFX_START + 1648) -#define SID_LOGOUT (SID_SFX_START + 1652) #define SID_JUMPMARK(SID_SFX_START + 1654) #define SID_BROWSE (SID_SFX_START + 1658) // FREE (was: SID_BACKTOWEBTOP) @@ -221,7 +216,6 @@ #define SID_MACRO_SIGNATURE (SID_SFX_START + 1704) #define SID_ATTR_WARNALIENFORMAT(SID_SFX_START + 1705) #define SID_COPY_STREAM_IF_POSSIBLE (SID_SFX_START + 1706) -#define SID_MAIL_SENDDOCASFORMAT(SID_SFX_START + 1707) #define SID_MAIL_SENDDOCASMS(SID_SFX_START + 1708) #define SID_MAIL_SENDDOCASOOO (SID_SFX_START + 1709) #define SID_NO_ACCEPT_DIALOG(SID_SFX_START + 1710) @@ -259,9 +253,6 @@ #define SID_FOCUSURLBOX (SID_SFX_START + 1406) -#define SID_ACTIVATE(SID_SFX_START + 525) -#define SID_PRINTOUT(SID_SFX_START + 526) - #define SID_FILTER_NAME (SID_SFX_START + 530) #define SID_DOC_SALVAGE (SID_SFX_START + 531) #define SID_INSERTDOC (SID_SFX_START + 532) @@ -270,10 +261,7 @@ #define SID_DOC_READONLY(SID_SFX_START + 590) #define SID_DOC_MODIFIED(SID_SFX_START + 584) #define SID_DOC_LOADING (SID_SFX_START + 585) -#define SID_IMG_LOADING (SID_SFX_START + 586) -#define SID_DOC_SAVED (SID_SFX_START + 599) #define SID_DOCINFO
Re: How to check Uno objects types with Basic macro ?
Hi Patric, I'm using basic macros with LibreOffice 5.4.2.2. I would like to check that > a basic Object is a document Section. I find out XTypeProvider interface you can use something like this: Sub Main If hasUnoInterfaces(ThisComponent, "com.sun.star.sheet.XSpreadsheetDocument") Then MsgBox "Spreadsheet" EndIf End Sub > By the way, do you know a good book/PDF to download about UNO interface > and/or IDL language ? have a look at Andrew Pitonyak's "OpenOffice.org Macros Explained" book http://www.pitonyak.org/book/ Regards Oliver ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/PythonTest.mk |2 +- solenv/gbuild/platform/unittest-failed-MACOSX.sh | 13 + solenv/gbuild/platform/unittest-failed-WNT.sh | 13 + solenv/gbuild/platform/unittest-failed-default.sh | 13 + 4 files changed, 40 insertions(+), 1 deletion(-) New commits: commit c48b87e6e6c23152135c73dddb63c1be9cc321fc Author: Miklos Vajna Date: Thu Dec 21 13:41:19 2017 +0100 solenv: support PYTHON_TEST_NAME for python tests This is similar to CPPUNIT_TEST_NAME for CppunitTests, i.e. allows running a single module/class/method only, instead of all modules added by gb_PythonTest_add_modules. Example: make PythonTest_sw_python PYTHON_TEST_NAME="text_portion_enumeration_test.TextPortionEnumerationTest.test_empty2" Change-Id: Ibed5729bc29a5112216bce211455d6c6a0837b30 Reviewed-on: https://gerrit.libreoffice.org/46907 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 8ac62c43f445..7ee833a730fc 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -57,7 +57,7 @@ else )) \ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \ $(gb_PythonTest_COMMAND) \ - $(MODULES) \ + $(if $(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \ $(if $(gb_CppunitTest__interactive),, \ > $@.log 2>&1 \ || ($(if $(value gb_CppunitTest_postprocess), \ diff --git a/solenv/gbuild/platform/unittest-failed-MACOSX.sh b/solenv/gbuild/platform/unittest-failed-MACOSX.sh index 0e7eab798398..7994dbd56b01 100755 --- a/solenv/gbuild/platform/unittest-failed-MACOSX.sh +++ b/solenv/gbuild/platform/unittest-failed-MACOSX.sh @@ -24,9 +24,22 @@ make $1Test_$2 VALGRIND=memcheck# for memory checking You can limit the execution to just one particular test by: +EOF + +case $1 in +Python) +cat << EOF +make $1Test_$2 PYTHON_TEST_NAME="testXYZ" ...above mentioned params... + +EOF +;; +*) +cat << EOF make $1Test_$2 CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params... EOF +;; +esac exit 1 diff --git a/solenv/gbuild/platform/unittest-failed-WNT.sh b/solenv/gbuild/platform/unittest-failed-WNT.sh index d5df28ce186c..5ace1f0d1d95 100755 --- a/solenv/gbuild/platform/unittest-failed-WNT.sh +++ b/solenv/gbuild/platform/unittest-failed-WNT.sh @@ -25,9 +25,22 @@ make $1Test_$2 CPPUNITTRACE="drmemory -free_max_frames 20" # for memory checking You can limit the execution to just one particular test by: +EOF + +case $1 in +Python) +cat << EOF +make $1Test_$2 PYTHON_TEST_NAME="testXYZ" ...above mentioned params... + +EOF +;; +*) +cat << EOF make $1Test_$2 CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params... EOF +;; +esac exit 1 diff --git a/solenv/gbuild/platform/unittest-failed-default.sh b/solenv/gbuild/platform/unittest-failed-default.sh index 2ec0c40fe92d..1e742fd7f16d 100755 --- a/solenv/gbuild/platform/unittest-failed-default.sh +++ b/solenv/gbuild/platform/unittest-failed-default.sh @@ -29,9 +29,22 @@ make $1Test_$2 DEBUGCPPUNIT=TRUE You can limit the execution to just one particular test by: +EOF + +case $1 in +Python) +cat << EOF +make PYTHON_TEST_NAME="testXYZ" ...above mentioned params... + +EOF +;; +*) +cat << EOF make CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params... EOF +;; +esac exit 1 ___ 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' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx |1 +
vcl/unx/gtk3/gtk3gtkframe.cxx | 11 ---
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 236d245428ec290f9b5efe4cd68996a7d4e6509e
Author: Caolán McNamara
Date: Thu Dec 21 13:00:03 2017 +
Resolves: tdf#114592 mark geometry as provisional
when we predict what it will be and use that flag to decide
to forward notification of arrival of confirmation of geometry
Change-Id: I4a7334d75eb7977c85aebcf2b652cc4b2d6b25bb
Reviewed-on: https://gerrit.libreoffice.org/46912
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 236cf29c29de..0c9b002cb264 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -217,6 +217,7 @@ class GtkSalFrame : public SalFrame
GtkDragSource* m_pDragSource;
boolm_bInDrag;
GtkDnDTransferable* m_pFormatConversionRequest;
+boolm_bGeometryIsProvisional;
#else
GdkRegion* m_pRegion;
boolm_bSetFocusOnMap;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 725c64594d92..27a65caa3612 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1077,6 +1077,7 @@ void GtkSalFrame::InitCommon()
m_pDragSource = nullptr;
m_bInDrag = false;
m_pFormatConversionRequest = nullptr;
+m_bGeometryIsProvisional = false;
m_ePointerStyle = static_cast(0x);
m_pSalMenu = nullptr;
m_nWatcherId= 0;
@@ -1620,6 +1621,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long
nWidth, long nHeight, sal_u
maGeometry.nX = nX;
maGeometry.nY = nY;
+m_bGeometryIsProvisional = true;
m_bDefaultPos = false;
@@ -2627,8 +2629,9 @@ gboolean GtkSalFrame::signalButton( GtkWidget*,
GdkEventButton* pEvent, gpointer
{
int frame_x = (int)(pEvent->x_root - pEvent->x);
int frame_y = (int)(pEvent->y_root - pEvent->y);
-if (frame_x != pThis->maGeometry.nX || frame_y != pThis->maGeometry.nY)
+if (pThis->m_bGeometryIsProvisional || frame_x != pThis->maGeometry.nX
|| frame_y != pThis->maGeometry.nY)
{
+pThis->m_bGeometryIsProvisional = false;
pThis->maGeometry.nX = frame_x;
pThis->maGeometry.nY = frame_y;
ImplSVData* pSVData = ImplGetSVData();
@@ -2851,8 +2854,9 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*,
GdkEventMotion* pEvent, gpointer
int frame_x = (int)(pEvent->x_root - pEvent->x);
int frame_y = (int)(pEvent->y_root - pEvent->y);
-if (frame_x != pThis->maGeometry.nX || frame_y != pThis->maGeometry.nY)
+if (pThis->m_bGeometryIsProvisional || frame_x != pThis->maGeometry.nX ||
frame_y != pThis->maGeometry.nY)
{
+pThis->m_bGeometryIsProvisional = false;
pThis->maGeometry.nX = frame_x;
pThis->maGeometry.nY = frame_y;
ImplSVData* pSVData = ImplGetSVData();
@@ -2975,9 +2979,10 @@ gboolean GtkSalFrame::signalConfigure(GtkWidget*,
GdkEventConfigure* pEvent, gpo
* yet the gdkdisplay-x11.c code handling configure_events has
* done this XTranslateCoordinates work since the day ~zero.
*/
-if( x != pThis->maGeometry.nX || y != pThis->maGeometry.nY )
+if (pThis->m_bGeometryIsProvisional || x != pThis->maGeometry.nX || y !=
pThis->maGeometry.nY )
{
bMoved = true;
+pThis->m_bGeometryIsProvisional = false;
pThis->maGeometry.nX = x;
pThis->maGeometry.nY = y;
}
___
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' - download.lst external/more_fonts
download.lst|4 ++-- external/more_fonts/ExternalPackage_noto.mk | 18 ++ 2 files changed, 20 insertions(+), 2 deletions(-) New commits: commit ae08be01b10d3e7e483f93a1e5ed77354939601d Author: Yousuf Philips Date: Sat Dec 16 16:18:18 2017 +0400 tdf#103080 October 2017 update to Noto fonts In addition to updates to the already bundled fonts, Condensed and Light weights of English Noto Sans and Noto Serif have been added, as well as the addition of the Noto Sans Arabic Change-Id: I72bd7815d678fb4723692eb90d352d012ffe035e Reviewed-on: https://gerrit.libreoffice.org/46596 Tested-by: Jenkins Reviewed-by: Yousuf Philips (cherry picked from commit e45e2c4897933f14c90a65fa74d0ad2a0b620ede) Reviewed-on: https://gerrit.libreoffice.org/46841 Reviewed-by: Eike Rathke diff --git a/download.lst b/download.lst index 23ba942aa3bf..491b56a0569e 100644 --- a/download.lst +++ b/download.lst @@ -68,8 +68,8 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz -export FONT_NOTO_SHA256SUM := 8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8 -export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz +export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 +export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz export FONT_CULMUS_SHA256SUM := dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk index adbb88fd4f6d..dd52ac956265 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -15,10 +15,20 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoMono-Regular.ttf \ NotoNaskhArabic-Bold.ttf \ NotoNaskhArabic-Regular.ttf \ + NotoNaskhArabicUI-Bold.ttf \ + NotoNaskhArabicUI-Regular.ttf \ + NotoSansArabic-Bold.ttf \ + NotoSansArabic-Regular.ttf \ + NotoSansArabicUI-Bold.ttf \ + NotoSansArabicUI-Regular.ttf \ NotoSansArmenian-Bold.ttf \ NotoSansArmenian-Regular.ttf \ NotoSans-Bold.ttf \ NotoSans-BoldItalic.ttf \ + NotoSans-Condensed.ttf \ + NotoSans-CondensedBold.ttf \ + NotoSans-CondensedBoldItalic.ttf \ + NotoSans-CondensedItalic.ttf \ NotoSansGeorgian-Bold.ttf \ NotoSansGeorgian-Regular.ttf \ NotoSansHebrew-Bold.ttf \ @@ -26,12 +36,18 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSans-Italic.ttf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ + NotoSans-Light.ttf \ + NotoSans-LightItalic.ttf \ NotoSansLisu-Regular.ttf \ NotoSans-Regular.ttf \ NotoSerifArmenian-Bold.ttf \ NotoSerifArmenian-Regular.ttf \ NotoSerif-Bold.ttf \ NotoSerif-BoldItalic.ttf \ + NotoSerif-Condensed.ttf \ + NotoSerif-CondensedBold.ttf \ + NotoSerif-CondensedBoldItalic.ttf \ + NotoSerif-CondensedItalic.ttf \ NotoSerifGeorgian-Bold.ttf \ NotoSerifGeorgian-Regular.ttf \ NotoSerifHebrew-Bold.ttf \ @@ -39,6 +55,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSerif-Italic.ttf \ NotoSerifLao-Bold.ttf \ NotoSerifLao-Regular.ttf \ + NotoSerif-Light.ttf \ + NotoSerif-LightItalic.ttf \ NotoSerif-Regular.ttf \ )) ___ 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' - sd/source svx/source
sd/source/ui/func/fuediglu.cxx |2 +-
svx/source/svdraw/svddrgv.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6442a8976b4accb53acb902834171ab5f1802d2a
Author: Mark Hung
Date: Fri Dec 15 00:13:49 2017 +0800
tdf113594: marking gluepoints immediately.
pPV was for the parameter of MarkGluePoint that was removed
in ec38966951f2, and was kept somehow and is converted
to bool here. Just replace the default boolean value to false
( that means marking instead of unmarking. )
Change-Id: I4c4b9dd368537b7b90cc4effae482a7b8a41eec9
Reviewed-on: https://gerrit.libreoffice.org/46472
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit bf151f0716910b56e3538579f4af7ede8f51bbcf)
Reviewed-on: https://gerrit.libreoffice.org/46497
(cherry picked from commit 715d0f32eb36593a4c9e52763b2ceb17ec1283c5)
Reviewed-on: https://gerrit.libreoffice.org/46913
Reviewed-by: Aron Budea
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index bdb72cc6..daa4a6740ecc 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -141,7 +141,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent&
rMEvt)
if (!rMEvt.IsShift())
mpView->UnmarkAllGluePoints();
-mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, aVEvt.pPV);
+mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, false);
SdrHdl* pHdl = mpView->GetGluePointHdl(aVEvt.pObj, aVEvt.nGlueId);
if (pHdl)
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 2c4d78762e03..6b7a224ae27f 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -752,7 +752,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
rGP.SetAbsolutePos(rPnt,*pObj);
SdrHdl* pHdl=nullptr;
-if (MarkGluePoint(pObj,nGlueId,pPV))
+if (MarkGluePoint(pObj,nGlueId,false))
{
pHdl=GetGluePointHdl(pObj,nGlueId);
}
___
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' - sw/uiconfig
sw/uiconfig/sglobal/toolbar/frameobjectbar.xml |2 +- sw/uiconfig/sglobal/toolbar/oleobjectbar.xml |2 +- sw/uiconfig/swriter/toolbar/frameobjectbar.xml |2 +- sw/uiconfig/swriter/toolbar/oleobjectbar.xml |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit e673ca8aae33af5f6fbed31b17613173b3ef2c8a Author: Yousuf Philips Date: Thu Dec 21 06:42:27 2017 +0400 tdf#37697 Fix incorrect toolbar separator Change-Id: I2b42fd785516f6f719ba3853e9694652ad03e850 Reviewed-on: https://gerrit.libreoffice.org/46880 Tested-by: Jenkins Reviewed-by: Yousuf Philips (cherry picked from commit e07937bb4eccda742b03bfa9e7f0eb9d4e899e4e) Reviewed-on: https://gerrit.libreoffice.org/46918 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml index 5c293252eaa1..46a6e39fa1cc 100644 --- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml index 6cbf98575801..3824ccee8722 100644 --- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index 5c293252eaa1..46a6e39fa1cc 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index 6cbf98575801..3824ccee8722 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -32,7 +32,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl sfx2/source sw/source vcl/unx
include/vcl/sysdata.hxx| 13 +
sfx2/source/appl/appserv.cxx | 11 ---
sw/source/uibase/app/apphdl.cxx| 10 +-
vcl/unx/generic/fontmanager/fontconfig.cxx | 10 ++
4 files changed, 36 insertions(+), 8 deletions(-)
New commits:
commit 7cf4eeed81fd333c87dedffa792f5d547b7981f0
Author: Caolán McNamara
Date: Wed Dec 20 15:29:39 2017 +
set dbus id for existing DbusSessionHelper users
Change-Id: I64329e21ae79b6607856de9781bee0274b9cb136
Reviewed-on: https://gerrit.libreoffice.org/46854
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 794f424b4448..d05ceb44438a 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -98,6 +98,19 @@ struct SystemEnvData
}
};
+inline sal_uInt32 GetDbusId(const SystemEnvData& rData)
+{
+#if defined(_WIN32) || defined( MACOSX ) || defined( ANDROID ) || defined( IOS
)
+(void)rData;
+return 0;
+#elif defined( UNX )
+return rData.aWindow;
+#else
+(void)rData;
+return 0;
+#endif
+}
+
struct SystemParentData
{
sal_uInt32 nSize;// size in bytes of this structure
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 78f39b318b6b..31de5352644b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -60,6 +60,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -185,7 +186,7 @@ namespace
return false;
}
}
-void lcl_tryLoadBibliography()
+void lcl_tryLoadBibliography(const vcl::Window* pTopWindow)
{
// lp#527938, debian#602953, fdo#33266, i#105408
// make sure we actually can instantiate services from base first
@@ -197,7 +198,11 @@ namespace
using namespace svtools;
Reference< XSyncDbusSessionHelper >
xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext()));
Sequence< OUString > vPackages { "libreoffice-base" };
-xSyncDbusSessionHelper->InstallPackageNames(0, vPackages,
OUString());
+
+const SystemEnvData* pEnvData = pTopWindow ?
pTopWindow->GetSystemData() : nullptr;
+sal_uInt32 nDbusId = pEnvData ? GetDbusId(*pEnvData) : 0;
+
+xSyncDbusSessionHelper->InstallPackageNames(nDbusId,
vPackages, OUString());
// Ill be back (hopefully)!
SolarMutexGuard aGuard;
executeRestartDialog(comphelper::getProcessComponentContext(),
nullptr, RESTART_REASON_BIBLIOGRAPHY_INSTALL);
@@ -1662,7 +1667,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
break;
case SID_COMP_BIBLIOGRAPHY:
-lcl_tryLoadBibliography();
+lcl_tryLoadBibliography(GetTopWindow());
break;
}
}
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 467112e58956..d30e9b44bdd6 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -420,7 +421,14 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard(
const SfxItemSet * pArgs
using namespace svtools;
css::uno::Reference< XSyncDbusSessionHelper >
xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext()));
const css::uno::Sequence< OUString > vPackages{ "libreoffice-base"
};
-xSyncDbusSessionHelper->InstallPackageNames(0, vPackages,
OUString());
+
+vcl::Window* pTopWindow = Application::GetActiveTopWindow();
+if (!pTopWindow)
+pTopWindow = Application::GetFirstTopLevelWindow();
+const SystemEnvData* pEnvData = pTopWindow ?
pTopWindow->GetSystemData() : nullptr;
+sal_uInt32 nDbusId = pEnvData ? GetDbusId(*pEnvData) : 0;
+
+xSyncDbusSessionHelper->InstallPackageNames(nDbusId, vPackages,
OUString());
SolarMutexGuard aGuard;
executeRestartDialog(comphelper::getProcessComponentContext(),
nullptr, RESTART_REASON_MAILMERGE_INSTALL);
}
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 2c16e040cdab..1cff42cd1f44 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -866,11 +866,13 @@ namespace
#if ENABLE_GIO
guint get_xid_for_dbus()
{
-// FIXME: Application::GetActiveTopWindow only returns something
sensible if LO currently has the focus
-// (which is not the case when you are trying to debug this...). It
should instead return the last active window.
-const vcl::Window *pTopWindow = Application::IsHeadless
[Libreoffice-commits] core.git: bin/find-unused-sid-commands.py sc/inc sc/sdi sc/source
bin/find-unused-sid-commands.py | 53 +
sc/inc/sc.hrc| 23 --
sc/sdi/cellsh.sdi|9 -
sc/sdi/docsh.sdi |4
sc/sdi/scalc.sdi | 349 ---
sc/sdi/tabvwsh.sdi |8
sc/source/ui/docshell/docsh4.cxx | 49 -
sc/source/ui/view/cellsh.cxx | 52 -
sc/source/ui/view/cellsh1.cxx| 12 -
sc/source/ui/view/cellsh3.cxx| 18 --
sc/source/ui/view/tabvwsh3.cxx |7
sc/source/ui/view/tabvwshh.cxx | 161 -
12 files changed, 55 insertions(+), 690 deletions(-)
New commits:
commit 9c4350441191ccfd6af3d73e13b4eb59af7ed6d1
Author: Noel Grandin
Date: Thu Dec 21 09:21:42 2017 +0200
unused SID commands in sc
Change-Id: Ifb732e0a52ac7222e0dfb7054981708fa5722b35
Reviewed-on: https://gerrit.libreoffice.org/46886
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/bin/find-unused-sid-commands.py b/bin/find-unused-sid-commands.py
new file mode 100755
index ..32f45e0f810a
--- /dev/null
+++ b/bin/find-unused-sid-commands.py
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+#
+# Find potentially unused UNO command entries in SDI files.
+#
+# Note that this is not foolproof, some extra checking is required because
some command names might be
+# constructed at runtime.
+#
+
+import subprocess
+
+# search for entries in .sdi files that declare UNO/SID commands
+a = subprocess.Popen("git grep -P '^\s*\w+Item\s+\w+\s+SID_\w+$' -- *.sdi",
stdout=subprocess.PIPE, shell=True)
+
+# parse out the UNO command names
+commandSet = list()
+with a.stdout as txt:
+for line in txt:
+line = line.strip()
+idx1 = line.find(" ")
+idx2 = line.find(" ", idx1 + 1)
+commandName = line[idx1+1 : idx2].strip()
+sidName = line[idx2+1:].strip()
+commandSet.append((commandName,sidName))
+
+# now check to see if that UNO command is called anywhere in the codebase.
+for pair in commandSet:
+commandName = pair[0]
+sidName = pair[1]
+
+# check to see if that UNO command is called anywhere in the codebase.
+a = subprocess.Popen("git grep -wFn '.uno:" + commandName + "'",
stdout=subprocess.PIPE, shell=True)
+cnt = 0
+with a.stdout as txt2:
+for line2 in txt2:
+cnt = cnt + 1
+if cnt > 0: continue
+
+# check to see if the SID is used programmatically
+foundLines = ""
+a = subprocess.Popen("git grep -wn " + sidName, stdout=subprocess.PIPE,
shell=True)
+with a.stdout as txt2:
+for line2 in txt2:
+foundLines = foundLines + line2
+if foundLines.find("ExecuteList") != -1: continue
+if foundLines.find("GetDispatcher()->Execute") != -1: continue
+if foundLines.find("ExecuteScenarioSlot") != -1: continue
+# TODO not sure about this, but let's tackle the easy ones first
+if foundLines.find("Invalidate(") != -1: continue
+
+# dump any lines that contain the SID, so we can eyeball the results
+print("remove: " + commandName)
+print(foundLines)
+
print("")
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index ee3caa1d7e7c..91f29cbaadd4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -194,8 +194,6 @@
#define SID_CHART_NAME (SC_MESSAGE_START + 26)
#define SID_CHART_ADDSOURCE (SC_MESSAGE_START + 27)
-#define SID_AUTO_STYLE (SC_MESSAGE_START + 28)
-
#define FID_INPUTLINE_BLOCK (SC_MESSAGE_START + 29)
#define SID_STATUS_SUM (SC_MESSAGE_START + 30)
@@ -438,7 +436,6 @@
#define DETECTIVE_END (DETECTIVE_START+20)
#define SID_API_SLOTS (DETECTIVE_END)
-#define SID_INSERT_MATRIX (SID_API_SLOTS+1)
#define SID_DELETE_NOTE (SID_API_SLOTS+2)
@@ -494,8 +491,6 @@
#define SID_SETINPUTMODE(SID_KEYFUNC_START + 31)
#define SID_DELETE_CONTENTS (SID_KEYFUNC_START + 32)
-#define SID_MARKAREA(SID_KEYFUNC_START + 33)
-
#define FID_FILL_AUTO (SID_KEYFUNC_START + 35)
#define SID_CANCEL (SID_KEYFUNC_START + 36)
@@ -518,20 +513,12 @@
#define SID_RANGE_ROW (SID_NEW_SLOTS+20)
#define SID_RANGE_COL (SID_NEW_SLOTS+21)
-#define SID_RANGE_TABLE (SID_NEW_SLOTS+22)
-#define SID_RANGE_VALUE (SID_NEW_SLOTS+23)
-#define SID_RANGE_FORMULA (SID_NEW_SLOTS+24)
-#define SID_RANGE_TEXTVALUE (SID_NEW_SLOTS+26)
-#define SID_TABLE_ACTIVATE (SID_NEW_SLOTS+27)
#define SID_DEFINE_PRINTAREA(SID_NEW_SLOTS+31)
#define SID_DELETE_PRINTAREA(SID_NEW_SLOTS+32)
#define SID_CHANGE_PRINTAREA(SID_NEW_SLOTS+33)
#define SID_OPENDLG_EDIT_PRINTAREA (SID_NEW_SLOTS+34)
-#define SID_OLE_ACTIVATE(SID_NEW_SLOTS+36)
-#define SID_OLE_DEACTIVATE (SID_NEW_SLOTS+37)
-
#define SID_TOGGLE_REL (SID_NEW_SLOTS+38)
#define SID_DATA_SELECT (SID_NEW_S
minutes of ESC call ...
* Present: + Stephan, Olivier, Eike, Michael M, Heiko, Sophie, Cloph, Miklos, Kendy, Caolán, Thorsten * Completed Action Items: + remove internal file-picker from the options page (Heiko) + add internal file-picker removal to “pending removal” release-notes in 6.0 (Heiko) + ticket for discussion; Rene has concerns https://bugs.documentfoundation.org/show_bug.cgi?id=114484 commit comment was misleading just disabled file (Michael) + the internal print dialog is not shown at all, see comment on ticket (Heiko) ] * Pending Action Items: + come up with a list of retiring committers to mail (Norbert) * Release Engineering update (Christian) + 5.4.4 RC2 + released as final yesterday. + issue installing on WinXP – forgot the SDK switch to enable it. + builds are running, and will replace builds on mirrors when done + re-doing and replace & announce on twitter. + 6.0 RC1 + builds are done, and up-loading + no additional branch yet – but on -6-0 branch + still in 1x review mode. + 6-0-0 branch is due Jan 9th for RC2. + late features + gpg4libre branch (Thorsten) [ almost done with decrypting – but negative time. expect things next week. ] + HTML help pieces (Olivier) [ still working, not yet ready – fixing l10n issues working sfx2 to make it work. Kendy has a patch to help out. ] + ‘experimental’ Calc / threading UI setting (Michael) [ disabled threading by default for 6.0 not got this setting in ? (Michael) + apparently patch in 6-0 (Eike) + fine with keeping it in if translators are happy + no problem (Sophie) + seems its not in – lets push it but mark it highly experimental (Eike) ] + VC Runtime re-distributable installer (Cloph) [ change added to master, included in TB builds, will cherry-pick to 6-0 branch ] + Android + patch for unified headers don’t switch to llvm on ARM + working for Intel & ARM – but still in gerrit + along with patches avoiding Nnullptr exceptions loading docs. + Online + 6.0.0 RC1 source up-loaded + ongoing fixing & polish there. * Documentation (Olivier) + Working on the XSLT transformation to get relative paths for help + same pages will serve local and online versions + Several corrections and additions to help pages + Working on the LO call to the local help in HTML + Guides 6.0: Stalled. Holliday season + found issue with online docs (Stephan) + start page – get a re-direct to somewhere with no-redirect token + something broke; filed a red-mine ticket. * UX Update (Heiko) + Bugzilla (topicUI) statistics 254(254) (topicUI) bugs open, 328(328) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month3 months 12 months added 2(0) 10(-1) 39(-4) 109(-5) commented 26(-6) 152(-25) 538(-36) 2192(-68) removed 0(0) 2(0) 3(-2) 21(0) resolved 5(2) 20(0) 58(2) 243(1) + top 10 contributors: Tietze, Heiko made 63 changes in 1 month, and 1059 changes in 1 year Philips, Yousuf made 30 changes in 1 month, and 785 changes in 1 year Xisco Faulí made 22 changes in 1 month, and 395 changes in 1 year Foote, V Stuart made 19 changes in 1 month, and 352 changes in 1 year Thomas Lendo made 16 changes in 1 month, and 409 changes in 1 year Zolnai, Tamás made 16 changes in 1 month, and 145 changes in 1 year Henschel, Regina made 13 changes in 1 month, and 125 changes in 1 year kompilainenn made 13 changes in 1 month, and 25 changes in 1 year Monastirsky, Maxim made 12 changes in 1 month, and 33 changes in 1 year Cor Nouws made 10 changes in 1 month, and 181 changes in 1 year + late changes to Draw main menu + https://gerrit.libreoffice.org/#/c/46867/ + could also be done without string changes + getting very late wrt. freezes (Michael) + lets not make a habit of it. + if several strings – not important to break freeze (Sophie) + can we get it in without the string changes ? (Heiko) => lets keep it as is – and do it in -6-1 + new default colors for shapes, problem with unit tests + https://bugs.documentfoundation.org/show_bug.cgi?id=112541 + http://nabble.documentfoundation.org/unit-test-for-COL-DEFAULT-SHAPE-FILLING-tt4229400.html + changing the default color – to have a different non-sky-blue name + have to
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f86bc2814eab51e40d577491fb8f8a464267f7d2
Author: Aditya Dewan
Date: Mon Dec 11 01:48:58 2017 +0530
close user list pop up on checkbox click
Change-Id: Ied483b0bb484e93a665ed1197f3e48c3fc6e6020
Reviewed-on: https://gerrit.libreoffice.org/46196
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 5baaf22d..bcee2626 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1717,12 +1717,12 @@ function editorUpdate(e) {
$('.selected-user').removeClass('selected-user');
if ($(userlistItem.html).find('.selected-user').length !== 0)
userlistItem.html =
$(userlistItem.html).find('.selected-user').removeClass('selected-user').parent().parent().parent()[0].outerHTML;
- $('#tb_toolbar-down_item_userlist').w2overlay('');
}
else {
docLayer._followEditor = false;
docLayer._followThis = -1;
}
+ $('#tb_toolbar-down_item_userlist').w2overlay('');
}
function selectUser(viewId) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - chart2/source include/svx svx/source
chart2/source/view/charttypes/BarChart.cxx | 55 ++---
include/svx/scene3d.hxx|6 ++-
svx/source/engine3d/scene3d.cxx|9 +++-
3 files changed, 61 insertions(+), 9 deletions(-)
New commits:
commit 394e869234cb27d5526716f7d9a9c1e491735a41
Author: Tomaž Vajngerl
Date: Thu Dec 21 20:08:33 2017 +0900
chart2: suspend/resume setting rects dirty for 3D shapes
Previously we bypassed setting rects as dirty for a scene just
before we are about to create a 3D object. With this change we
do it earlier and suspend for the whole time we are creating the
scene - so we guarantee to o it for all 3D objects in that code
path. Aferwards we resume with setting rects and mark the whole
scene as dirty so we don't miss some update.
Reviewed-on: https://gerrit.libreoffice.org/46901
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit b2c3233e5f267b5d244d722a94424a3b224b3314)
Change-Id: Ie4dec644102140edf282a2f5f6eb7fc9b81dbe48
Reviewed-on: https://gerrit.libreoffice.org/46919
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/chart2/source/view/charttypes/BarChart.cxx
b/chart2/source/view/charttypes/BarChart.cxx
index f7206dafb70e..c79cc53c4ee6 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -29,11 +29,13 @@
#include "DateHelper.hxx"
#include
#include
+#include
#include
#include
#include
+#include
namespace chart
{
@@ -41,6 +43,27 @@ using namespace ::com::sun::star;
using namespace ::rtl::math;
using namespace ::com::sun::star::chart2;
+namespace
+{
+
+struct XShapeCompare
+{
+bool operator() (uno::Reference const & lhs,
uno::Reference const & rhs) const
+{
+return lhs.get() < rhs.get();
+}
+};
+
+struct XShapeHash
+{
+bool operator()(uno::Reference const & rXShape) const
+{
+return rXShape->getShapeType().hashCode();
+}
+};
+
+} // end anonymous namespace
+
BarChart::BarChart( const uno::Reference& xChartTypeModel
, sal_Int32 nDimensionCount )
: VSeriesPlotter( xChartTypeModel, nDimensionCount )
@@ -408,11 +431,11 @@ void
BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
}
}
-E3dScene* lcl_getE3dScene(uno::Reference const & xShapes)
+E3dScene* lcl_getE3dScene(uno::Reference const & xInterface)
{
E3dScene* pScene = nullptr;
-SvxShape* pSvxShape = SvxShape::getImplementation(xShapes);
+SvxShape* pSvxShape = SvxShape::getImplementation(xInterface);
if (pSvxShape)
{
SdrObject* pObject = pSvxShape->GetSdrObject();
@@ -455,6 +478,25 @@ void BarChart::createShapes()
bool bDrawConnectionLinesInited = false;
bool bOnlyConnectionLinesForThisPoint = false;
+std::unordered_set, XShapeHash,
XShapeCompare> aShapeSet;
+
+const comphelper::ScopeGuard aGuard([aShapeSet]() {
+
+std::unordered_set aSceneSet;
+
+for (uno::Reference const & rShape : aShapeSet)
+{
+E3dScene* pScene = lcl_getE3dScene(rShape);
+if (pScene)
+aSceneSet.insert(pScene->GetScene());
+}
+for (E3dScene* pScene : aSceneSet)
+{
+pScene->ResumeReportingDirtyRects();
+pScene->SetAllSceneRectsDirty();
+}
+});
+
adaptOverlapAndGapwidthForGroupBarsPerAxis();
//better performance for big data
@@ -604,6 +646,12 @@ void BarChart::createShapes()
uno::Reference< drawing::XShapes >
xSeriesGroupShape_Shapes(
getSeriesGroupShape(*aSeriesIter, xSeriesTarget) );
+uno::Reference
xSeriesGroupShape(xSeriesGroupShape_Shapes, uno::UNO_QUERY);
+// Suspend setting rects dirty for the duration of this
call
+aShapeSet.insert(xSeriesGroupShape);
+E3dScene* pScene = lcl_getE3dScene(xSeriesGroupShape);
+if (pScene)
+pScene->SuspendReportingDirtyRects();
//collect data point information (logic coordinates, style
):
double fUnscaledLogicX = (*aSeriesIter)->getXValue(
nPointIndex );
@@ -794,12 +842,9 @@ void BarChart::createShapes()
if( fTopHeight < 0 )
fTopHeight *= -1.0;
-E3dScene* pScene =
lcl_getE3dScene(xSeriesGroupShape_Shapes);
-pScene->EnterObjectSetupMode();
xShape = createDataPoint3D_Bar(
xSeriesGroupShape_Shapes,
aTransformedBottom, aSize, fTopHeight, nRotateZAngleHundredthDegree
, xDataPointProperties, nGeometry3D );
-pScene->ExitObjectSetupMode();
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/e192796dde1c1d94aa05a70b55e04c0f778f4389/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/popupmenu/pagepane.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86fc5440dd2b4634635202c09d1e6240909d68f7 Author: Yousuf Philips Date: Thu Dec 21 15:44:24 2017 +0400 Correct impress slide pane popup Navigate label Change-Id: Idd582e4559cd6bd1005de0d8158e57d40ddd3c98 Reviewed-on: https://gerrit.libreoffice.org/46903 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/sd/uiconfig/simpress/popupmenu/pagepane.xml b/sd/uiconfig/simpress/popupmenu/pagepane.xml index 98ac0c7dfbea..f790b402 100644 --- a/sd/uiconfig/simpress/popupmenu/pagepane.xml +++ b/sd/uiconfig/simpress/popupmenu/pagepane.xml @@ -44,7 +44,7 @@ - + ___ 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/sglobal/toolbar/frameobjectbar.xml |2 +- sw/uiconfig/sglobal/toolbar/oleobjectbar.xml |2 +- sw/uiconfig/swriter/toolbar/frameobjectbar.xml |2 +- sw/uiconfig/swriter/toolbar/oleobjectbar.xml |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit e07937bb4eccda742b03bfa9e7f0eb9d4e899e4e Author: Yousuf Philips Date: Thu Dec 21 06:42:27 2017 +0400 tdf#37697 Fix incorrect toolbar separator Change-Id: I2b42fd785516f6f719ba3853e9694652ad03e850 Reviewed-on: https://gerrit.libreoffice.org/46880 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml index 5c293252eaa1..46a6e39fa1cc 100644 --- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml index 6cbf98575801..3824ccee8722 100644 --- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index 5c293252eaa1..46a6e39fa1cc 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index 6cbf98575801..3824ccee8722 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -32,7 +32,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text
source/text/shared/01/01020001.xhp |2 +- source/text/shared/01/01060001.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a033bdbf3aec12cb3d55fe5878bf3a30b59357c9 Author: Olivier Hallot Date: Thu Dec 21 10:08:14 2017 -0200 Fix XML tag Change-Id: I0d2675b69675c26d9dcc1d2bee0abb745638b24e Reviewed-on: https://gerrit.libreoffice.org/46906 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot (cherry picked from commit bb3fd71d51c84aa93df51c9e66d2dc0d1596d1a9) Reviewed-on: https://gerrit.libreoffice.org/46914 diff --git a/source/text/shared/01/01020001.xhp b/source/text/shared/01/01020001.xhp index c24b72fbc..22e1e4bee 100644 --- a/source/text/shared/01/01020001.xhp +++ b/source/text/shared/01/01020001.xhp @@ -23,7 +23,7 @@ open;remote file Open Remote... -Opens a document located in a remote file service. + Opens a document located in a remote file service. Choose File - Open Remote.. diff --git a/source/text/shared/01/01060001.xhp b/source/text/shared/01/01060001.xhp index 38dca298c..c3fe8e397 100644 --- a/source/text/shared/01/01060001.xhp +++ b/source/text/shared/01/01060001.xhp @@ -23,7 +23,7 @@ save;remote file Save Remote... -Saves a document located in a remote file service. + Saves a document located in a remote file service. Choose File - Save Remote.. ___ 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' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 426b3775ae7c62f8625b3c82c4b6ad153da55dda Author: Olivier Hallot Date: Thu Dec 21 10:08:14 2017 -0200 Updated core Project: help a033bdbf3aec12cb3d55fe5878bf3a30b59357c9 Fix XML tag Change-Id: I0d2675b69675c26d9dcc1d2bee0abb745638b24e Reviewed-on: https://gerrit.libreoffice.org/46906 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot (cherry picked from commit bb3fd71d51c84aa93df51c9e66d2dc0d1596d1a9) Reviewed-on: https://gerrit.libreoffice.org/46914 diff --git a/helpcontent2 b/helpcontent2 index c31705b9387d..a033bdbf3aec 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c31705b9387dd7c5a94717c7c9ab9ab86f6f5f28 +Subproject commit a033bdbf3aec12cb3d55fe5878bf3a30b59357c9 ___ 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/01020001.xhp |2 +- source/text/shared/01/01060001.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit bb3fd71d51c84aa93df51c9e66d2dc0d1596d1a9 Author: Olivier Hallot Date: Thu Dec 21 10:08:14 2017 -0200 Fix XML tag Change-Id: I0d2675b69675c26d9dcc1d2bee0abb745638b24e Reviewed-on: https://gerrit.libreoffice.org/46906 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/shared/01/01020001.xhp b/source/text/shared/01/01020001.xhp index c24b72fbc..22e1e4bee 100644 --- a/source/text/shared/01/01020001.xhp +++ b/source/text/shared/01/01020001.xhp @@ -23,7 +23,7 @@ open;remote file Open Remote... -Opens a document located in a remote file service. + Opens a document located in a remote file service. Choose File - Open Remote.. diff --git a/source/text/shared/01/01060001.xhp b/source/text/shared/01/01060001.xhp index 38dca298c..c3fe8e397 100644 --- a/source/text/shared/01/01060001.xhp +++ b/source/text/shared/01/01060001.xhp @@ -23,7 +23,7 @@ save;remote file Save Remote... -Saves a document located in a remote file service. + Saves a document located in a remote file service. Choose File - Save Remote.. ___ 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 dd60668ed654d71eeda7d9a6f1a9511d80032a66 Author: Olivier Hallot Date: Thu Dec 21 10:08:14 2017 -0200 Updated core Project: help bb3fd71d51c84aa93df51c9e66d2dc0d1596d1a9 Fix XML tag Change-Id: I0d2675b69675c26d9dcc1d2bee0abb745638b24e Reviewed-on: https://gerrit.libreoffice.org/46906 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 9a20a71a42c6..bb3fd71d51c8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9a20a71a42c6c3113b1e0c9d679565018474d2e4 +Subproject commit bb3fd71d51c84aa93df51c9e66d2dc0d1596d1a9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/source
sw/source/core/layout/pagechg.cxx | 113 ++
1 file changed, 104 insertions(+), 9 deletions(-)
New commits:
commit d0f51d571c2e24c647eea7f68085531d251ce812
Author: Armin Le Grand
Date: Wed Dec 20 09:51:52 2017 +0100
Make used Pages alive in AssertFlyPages
There is a case where docs are created/exist that have an empty
2nd page with a single, page-anchored Frame (e.g. graphic), not
using a PageBreak. Persistence works in this case due to method
AssertFlyPages adding the missing page at end, but when multiple of
these docs get serialized (e.g. MailMerge) the problem exists for
in-between pages, too, and needs to be corrected. Also need to
correct the Pages for the Frames when Pages in that situation were
corrected.
Change-Id: I7c8bbbf0668438af98bc615e5b7c472ea6eee906
Reviewed-on: https://gerrit.libreoffice.org/46855
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
Reviewed-on: https://gerrit.libreoffice.org/46891
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index f081ad6c6f3a..aac2ab98461d 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -191,10 +191,11 @@ SwPageFrame::SwPageFrame( SwFrameFormat *pFormat,
SwFrame* pSib, SwPageDesc *pPg
Frame().SSize( pFormat->GetFrameSize().GetSize() );
// create and insert body area if it is not a blank page
-SwDoc *pDoc = pFormat->GetDoc();
-if ( !(m_bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat())) )
+SwDoc* pDoc(pFormat->GetDoc());
+m_bEmptyPage = (pFormat == pDoc->GetEmptyPageFormat());
+
+if(!m_bEmptyPage)
{
-m_bEmptyPage = false;
Calc(pRenderContext); // so that the PrtArea is correct
SwBodyFrame *pBodyFrame = new SwBodyFrame( pDoc->GetDfltFrameFormat(),
this );
pBodyFrame->ChgSize( Prt().SSize() );
@@ -544,6 +545,28 @@ void SwPageFrame::UpdateAttr_( const SfxPoolItem *pOld,
const SfxPoolItem *pNew,
{
case RES_FMT_CHG:
{
+// state of m_bEmptyPage needs to be determined newly
+const bool bNewState(GetFormat() ==
GetFormat()->GetDoc()->GetEmptyPageFormat());
+
+if(m_bEmptyPage != bNewState)
+{
+// copy new state
+m_bEmptyPage = bNewState;
+
+if(nullptr == GetLower())
+{
+// if we were an empty page before there is not yet a
BodyArea in the
+// form of a SwBodyFrame, see constructor
+SwViewShell* pSh(getRootFrame()->GetCurrShell());
+vcl::RenderContext* pRenderContext(pSh ? pSh->GetOut() :
nullptr);
+Calc(pRenderContext); // so that the PrtArea is correct
+SwBodyFrame* pBodyFrame = new SwBodyFrame(GetFormat(),
this);
+pBodyFrame->ChgSize( Prt().SSize() );
+pBodyFrame->Paste(this);
+pBodyFrame->InvalidatePos();
+}
+}
+
// If the frame format is changed, several things might also
change:
// 1. columns:
assert(pOld && pNew); //FMT_CHG Missing Format
@@ -1389,19 +1412,81 @@ void SwRootFrame::AssertFlyPages()
const SwFrameFormats *pTable = pDoc->GetSpzFrameFormats();
// what page targets the "last" Fly?
-sal_uInt16 nMaxPg = 0;
+// note the needed pages in a set
+sal_uInt16 nMaxPg(0);
+std::set< sal_uInt16 > neededPages;
for ( size_t i = 0; i < pTable->size(); ++i )
{
const SwFormatAnchor &rAnch = (*pTable)[i]->GetAnchor();
-if ( !rAnch.GetContentAnchor() && nMaxPg < rAnch.GetPageNum() )
-nMaxPg = rAnch.GetPageNum();
+if(!rAnch.GetContentAnchor())
+{
+const sal_uInt16 nPageNum(rAnch.GetPageNum());
+
+// calc MaxPage (as before)
+nMaxPg = std::max(nMaxPg, nPageNum);
+
+// note as needed page
+neededPages.insert(nPageNum);
+}
}
+
// How many pages exist at the moment?
-SwPageFrame *pPage = static_cast(Lower());
-while ( pPage && pPage->GetNext() &&
-!static_cast(pPage->GetNext())->IsFootnotePage() )
+// And are there EmptyPages that are needed?
+SwPageFrame* pPage(static_cast(Lower()));
+SwPageFrame* pPrevPage(nullptr);
+SwPageFrame* pFirstRevivedEmptyPage(nullptr);
+
+while(pPage) // moved two while-conditions to break-statements (see below)
{
+const sal_uInt16 nPageNum(pPage->GetPhyPageNum());
+
+if(pPage->IsEmptyPage() &&
+nullptr != pPrevPage &&
+neededPages.find(nPageNum) != neededPages.end())
+{
+// This is an empty page, but it *is* needed since a SwFrame
+// is anchored at it directl
[Libreoffice-commits] core.git: Makefile.in Repository.mk vcl/Executable_htmlfuzzer.mk vcl/Module_vcl.mk vcl/workben
Makefile.in |2 - Repository.mk|1 vcl/Executable_htmlfuzzer.mk | 49 +++ vcl/Module_vcl.mk|1 vcl/workben/htmlfuzzer.cxx | 33 5 files changed, 85 insertions(+), 1 deletion(-) New commits: commit 0dc3b103d214cb6f92495482eb9d307920127ea2 Author: Caolán McNamara Date: Wed Dec 20 17:32:15 2017 + add html fuzzer This reverts commit 111db5b992ae5870e76313f76e633a4edcccf010. Change-Id: I1138592ab54865f4c2ac4599fab572c5666bf723 Reviewed-on: https://gerrit.libreoffice.org/46864 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/Makefile.in b/Makefile.in index 9ac31060e27f..8c777a67f4ee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -483,7 +483,7 @@ $(foreach ide,\ eclipsecdt,\ $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide -fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Rdb_services udkapi offapi Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math Library_forui Library_binaryurp Library_io Library_invocation Library_namingservice Library_proxyfac Library_uuresolver Module_ure Execu table_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer Executable_pptxfuzzer Executable_mmlfuzzer Executable_mtpfuzzer +fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Rdb_services udkapi offapi Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_boost_locale StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math Library_forui Library_binaryurp Library_io Library_invocation Library_namingservice Library_proxyfac Library_uuresolver Module_ure Execu table_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer Executable_pptxfuzzer Executable_mmlfuzzer Executable_mtpfuzzer Executable_htmlfuzzer endif # MAKE_RESTARTS diff --git a/Repository.mk b/Repository.mk index 4e9728adc5c6..cc540ef4139e 100644 --- a/Repository.mk +++ b/Reposi
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmlsect.cxx |3 ++-
sw/source/filter/html/htmltab.cxx | 14 ++
sw/source/filter/html/swhtml.hxx |2 ++
3 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit f297b0d043e0767d85f00aa1e4cae5b036b0ac51
Author: Caolán McNamara
Date: Thu Dec 21 11:24:52 2017 +
ofz: avoid deleting the table still being processed
Change-Id: Ia92d469fd0e280bdc6470e780ab12b00366f0f8d
Reviewed-on: https://gerrit.libreoffice.org/46902
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/html/htmlsect.cxx
b/sw/source/filter/html/htmlsect.cxx
index 67fa9d916d8a..56149052609f 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -195,7 +195,8 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
static_cast( &rContentStIdx.GetNode() );
aDelPam.GetPoint()->nNode = pStNd->EndOfSectionIndex() - 1;
-m_xDoc->getIDocumentContentOperations().DelFullPara( aDelPam );
+if (!CurrentTableInPaM(aDelPam))
+m_xDoc->getIDocumentContentOperations().DelFullPara(aDelPam);
// update page style
for( size_t i=0; i < m_xDoc->GetPageDescCnt(); i++ )
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 0f5f5ae162b1..7d40e971d559 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -5246,4 +5246,18 @@ std::shared_ptr
SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
return xRetTable;
}
+bool SwHTMLParser::CurrentTableInPaM(SwPaM& rPam) const
+{
+if (!m_xTable)
+return false;
+const SwTable *pTable = m_xTable->GetSwTable();
+if (!pTable)
+return false;
+const SwTableNode* pTableNode = pTable->GetTableNode();
+if (!pTableNode)
+return false;
+SwNodeIndex aTableNodeIndex(*pTableNode);
+return (aTableNodeIndex >= rPam.Start()->nNode && aTableNodeIndex <=
rPam.End()->nNode);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index a023d3549cfa..1392192852a9 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -867,6 +867,8 @@ private:
bool HasCurrentParaFlys( bool bNoSurroundOnly = false,
bool bSurroundOnly = false ) const;
+bool CurrentTableInPaM(SwPaM& rPam) const;
+
public: // used in tables
// Create brush item (with new) or 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - common/Crypto.cpp common/Seccomp.cpp configure.ac tools/mount.cpp
common/Crypto.cpp |2 +-
common/Seccomp.cpp |4 ++--
configure.ac |2 +-
tools/mount.cpp|4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1353408f00de61d5596ae5d917d545e48ba3
Author: Pranav Kant
Date: Thu Dec 21 16:14:49 2017 +0530
loplugin:includeform
Some files weren't rewritten from the last run.
Change-Id: I8c5beadaf2cf9b367158abe6f0a5460fa3054521
diff --git a/common/Crypto.cpp b/common/Crypto.cpp
index 2c125a2f..46ba05c0 100644
--- a/common/Crypto.cpp
+++ b/common/Crypto.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include
#if ENABLE_SUPPORT_KEY
diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index e49c4d5e..e9389f05 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -11,7 +11,7 @@
* exotic or un-necessary system calls to be used to break containment.
*/
-#include "config.h"
+#include
#include
#include
#include
@@ -30,7 +30,7 @@
#include
#include
-#include
+#include "Seccomp.hpp"
#ifndef SYS_SECCOMP
# define SYS_SECCOMP 1
diff --git a/tools/mount.cpp b/tools/mount.cpp
index 40c64eba..7afba1fc 100644
--- a/tools/mount.cpp
+++ b/tools/mount.cpp
@@ -10,11 +10,11 @@
* This is a very tiny helper to allow overlay mounting.
*/
-#include "config.h"
+#include
#include
-#include "security.h"
+#include
int main(int argc, char **argv)
{
commit 000e8a352c7e3c137be2cf22dd56b57a38d6cd9d
Author: Pranav Kant
Date: Tue Dec 19 04:10:36 2017 +0530
compilerplugins: pass absolute path to online dir
This makes plugin.so in core.git to enter in LOOL mode.
Change-Id: I99513b5a5b4e1ee2c26d16afa127b7a5da730ee3
diff --git a/configure.ac b/configure.ac
index 35a16c82..3172f12b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,7 +384,7 @@ done
# need this after the other stuff that uses the compiler because we don't want
to run configure-tests with the plugins enabled
AS_IF([test -n "$with_compiler_plugins"],
- [CPPFLAGS="$CPPFLAGS -Xclang -load -Xclang
${with_compiler_plugins}/compilerplugins/obj/plugin.so -Xclang -add-plugin
-Xclang loplugin"])
+ [CPPFLAGS="$CPPFLAGS -Xclang -load -Xclang
${with_compiler_plugins}/compilerplugins/obj/plugin.so -Xclang -add-plugin
-Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang
--lool-base-path=\${abs_top_srcdir}"])
AC_DEFINE_UNQUOTED([LOOLWSD_CACHEDIR],["$LOOLWSD_CACHEDIR"],[Cache folder])
AC_SUBST(LOOLWSD_CACHEDIR)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/plugin.cxx| 14 +-
compilerplugins/clang/plugin.hxx|4
compilerplugins/clang/pluginhandler.cxx | 16 +++-
compilerplugins/clang/pluginhandler.hxx |2 ++
4 files changed, 34 insertions(+), 2 deletions(-)
New commits:
commit b39e627be45f847554f11fdac040b6f4da4054ba
Author: Pranav Kant
Date: Sat Dec 16 14:50:30 2017 +0530
Allow compiler plugins for online
Change-Id: I8e45936ef5675d531be71496e8894b90eaf2f6e2
Reviewed-on: https://gerrit.libreoffice.org/46769
Tested-by: Jenkins
Reviewed-by: pranavk
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index e43cec4eb998..2e9e390b6714 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -18,6 +18,8 @@
#include
#include
+#include
+
#include "pluginhandler.hxx"
/*
@@ -618,10 +620,20 @@ bool hasPathnamePrefix(StringRef pathname, StringRef
prefix)
[](StringRef p, StringRef a) { return p.startswith(a); });
}
+std::string getAbsolutePath(StringRef path)
+{
+llvm::SmallString<1024> absPath(path);
+llvm::sys::fs::make_absolute(absPath);
+llvm::sys::path::remove_dots(absPath, true);
+return absPath.str().str();
+}
+
bool isSamePathname(StringRef pathname, StringRef other)
{
+std::string absPathname = getAbsolutePath(pathname);
+std::string absOther = getAbsolutePath(other);
return checkPathname(
-pathname, other, [](StringRef p, StringRef a) { return p == a; });
+absPathname, absOther, [](StringRef p, StringRef a) { return p == a;
});
}
} // namespace
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index 4560157e4afd..c6f1c7cbd6e8 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -79,6 +79,7 @@ protected:
bool isInUnoIncludeFile(const FunctionDecl*) const;
bool isDebugMode() const { return handler.isDebugMode(); }
+bool isLOOLMode() const { return handler.isLOOLMode(); }
static bool isUnitTestMode();
@@ -228,6 +229,9 @@ void normalizeDotDotInFilePath(std::string&);
// prefix may also contain backslashes:
bool hasPathnamePrefix(StringRef pathname, StringRef prefix);
+// get the absolute path for a given path
+std::string getAbsolutePath(StringRef path);
+
// Same as pathname == other, except on Windows, where pathname and other may
// also contain backslashes:
bool isSamePathname(StringRef pathname, StringRef other);
diff --git a/compilerplugins/clang/pluginhandler.cxx
b/compilerplugins/clang/pluginhandler.cxx
index 433bd0a9efad..150bc4d1ef4d 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -18,6 +18,7 @@
#include
#include
#include
+
#include
#if defined _WIN32
@@ -116,6 +117,8 @@ void PluginHandler::handleOption( const std::string& option
)
unitTestMode = true;
else if (option == "debug")
debugMode = true;
+else if ( option.substr(0, 15) == "lool-base-path=" )
+loolBasePath = option.substr(15);
else
report( DiagnosticsEngine::Fatal, "unknown option %0" ) << option;
}
@@ -193,7 +196,7 @@ bool PluginHandler::checkIgnoreLocation(SourceLocation loc)
if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
return true;
const char* bufferName = compiler.getSourceManager().getPresumedLoc(
expansionLoc ).getFilename();
-if (bufferName == NULL
+if (bufferName == nullptr
|| hasPathnamePrefix(bufferName, SRCDIR "/external/")
|| isSamePathname(bufferName, SRCDIR
"/sdext/source/pdfimport/wrapper/keyword_list") )
// workdir/CustomTarget/sdext/pdfimport/hash.cxx is generated from
@@ -222,6 +225,11 @@ bool PluginHandler::checkIgnoreLocation(SourceLocation loc)
if (hasPathnamePrefix(s, WORKDIR))
return true;
}
+if ( isLOOLMode() ) {
+std::string absPath = getAbsolutePath(bufferName);
+if ( StringRef(absPath).startswith(loolBasePath) )
+return false;
+}
if( hasPathnamePrefix(bufferName, BUILDDIR)
|| hasPathnamePrefix(bufferName, SRCDIR) )
return false; // ok
@@ -277,6 +285,12 @@ void PluginHandler::HandleTranslationUnit( ASTContext&
context )
pathWarning = "modified source in build dir : %0";
else if( name.startswith(SRCDIR "/") )
; // ok
+else if ( isLOOLMode() )
+{
+std::string absPath = getAbsolutePath(name);
+if ( !StringRef(absPath).startswith(loolBasePath) )
+bSkip = true;
+}
else
{
pathWarning = "modified source in unknown location, not modifying
: %0";
diff --git a/compilerplugins/clang/pluginhandler.hxx
b/compilerplugins/clang/pluginhandler.hxx
index ea0eb2444506..cb75f9443bb5 100644
--- a/compilerplugins/clang/pluginhandler.hxx
+++ b/co
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/section.hxx|2 +-
sw/source/core/docnode/ndsect.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ed29dc6b3b4d7baa1a85621cceb940707454d87d
Author: Tor Lillqvist
Date: Wed Dec 20 13:28:53 2017 +0200
Make SwSection::GetSectionName() return a reference to the name
Has a small but measureable impact on the time it takes to load a
specific pathological (huge) customer document. The load time drops
from 1min 46s to 1min 38s on my machine.
Reviewed-on: https://gerrit.libreoffice.org/46847
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
(cherry picked from commit 9675f307fbd7961b3d00f810dad3eacc9920e07d)
Change-Id: I93b603f369528187980d644a5364fa9bcf2f4615
Reviewed-on: https://gerrit.libreoffice.org/46904
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index e2584dc27e11..7eeadf7c0ebd 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -166,7 +166,7 @@ public:
void SetSectionData(SwSectionData const& rData);
-OUString GetSectionName() const { return m_Data.GetSectionName(); }
+const OUString& GetSectionName() const { return
m_Data.GetSectionName(); }
void SetSectionName(OUString const& rName){ m_Data.SetSectionName(rName); }
SectionType GetType() const { return m_Data.GetType(); }
void SetType(SectionType const eType) { return m_Data.SetType(eType); }
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index c8a1d4ccbbce..e5d2d017c799 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1371,7 +1371,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString*
pChkStr ) const
const SwSectionNode *const pSectNd = pFormat->GetSectionNode();
if( pSectNd != nullptr )
{
-const OUString rNm = pSectNd->GetSection().GetSectionName();
+const OUString& rNm = pSectNd->GetSection().GetSectionName();
if (rNm.startsWith( aName ))
{
// Calculate the Number and reset the Flag
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx |1 +
vcl/unx/gtk3/gtk3gtkframe.cxx | 11 ---
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 3c96ded851bc6887693e4ecbc1f5961dc430613c
Author: Caolán McNamara
Date: Thu Dec 21 13:00:03 2017 +
Resolves: tdf#114592 mark geometry as provisional
when we predict what it will be and use that flag to decide
to forward notification of arrival of confirmation of geometry
Change-Id: I4a7334d75eb7977c85aebcf2b652cc4b2d6b25bb
Reviewed-on: https://gerrit.libreoffice.org/46911
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 078ff5589b58..48e019c29770 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -217,6 +217,7 @@ class GtkSalFrame : public SalFrame
GtkDragSource* m_pDragSource;
boolm_bInDrag;
GtkDnDTransferable* m_pFormatConversionRequest;
+boolm_bGeometryIsProvisional;
#else
GdkRegion* m_pRegion;
boolm_bSetFocusOnMap;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index b05e675aaf5a..43f4094ac5b3 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1075,6 +1075,7 @@ void GtkSalFrame::InitCommon()
m_pDragSource = nullptr;
m_bInDrag = false;
m_pFormatConversionRequest = nullptr;
+m_bGeometryIsProvisional = false;
m_ePointerStyle = static_cast(0x);
m_pSalMenu = nullptr;
m_nWatcherId= 0;
@@ -1616,6 +1617,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long
nWidth, long nHeight, sal_u
maGeometry.nX = nX;
maGeometry.nY = nY;
+m_bGeometryIsProvisional = true;
m_bDefaultPos = false;
@@ -2595,8 +2597,9 @@ gboolean GtkSalFrame::signalButton( GtkWidget*,
GdkEventButton* pEvent, gpointer
{
int frame_x = (int)(pEvent->x_root - pEvent->x);
int frame_y = (int)(pEvent->y_root - pEvent->y);
-if (frame_x != pThis->maGeometry.nX || frame_y != pThis->maGeometry.nY)
+if (pThis->m_bGeometryIsProvisional || frame_x != pThis->maGeometry.nX
|| frame_y != pThis->maGeometry.nY)
{
+pThis->m_bGeometryIsProvisional = false;
pThis->maGeometry.nX = frame_x;
pThis->maGeometry.nY = frame_y;
ImplSVData* pSVData = ImplGetSVData();
@@ -2816,8 +2819,9 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*,
GdkEventMotion* pEvent, gpointer
int frame_x = (int)(pEvent->x_root - pEvent->x);
int frame_y = (int)(pEvent->y_root - pEvent->y);
-if (frame_x != pThis->maGeometry.nX || frame_y != pThis->maGeometry.nY)
+if (pThis->m_bGeometryIsProvisional || frame_x != pThis->maGeometry.nX ||
frame_y != pThis->maGeometry.nY)
{
+pThis->m_bGeometryIsProvisional = false;
pThis->maGeometry.nX = frame_x;
pThis->maGeometry.nY = frame_y;
ImplSVData* pSVData = ImplGetSVData();
@@ -2940,9 +2944,10 @@ gboolean GtkSalFrame::signalConfigure(GtkWidget*,
GdkEventConfigure* pEvent, gpo
* yet the gdkdisplay-x11.c code handling configure_events has
* done this XTranslateCoordinates work since the day ~zero.
*/
-if( x != pThis->maGeometry.nX || y != pThis->maGeometry.nY )
+if (pThis->m_bGeometryIsProvisional || x != pThis->maGeometry.nX || y !=
pThis->maGeometry.nY )
{
bMoved = true;
+pThis->m_bGeometryIsProvisional = false;
pThis->maGeometry.nX = x;
pThis->maGeometry.nY = y;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/condformat/condformatdlg.cxx |4 1 file changed, 4 insertions(+) New commits: commit 6db8e752c6075d69d5ff475e15a12317ac9aa4e2 Author: tagezi 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 Reviewed-by: Mike Kaganski 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: chart2/source include/svx svx/source
chart2/source/view/charttypes/BarChart.cxx | 61 +
include/svx/scene3d.hxx|6 +-
svx/source/engine3d/scene3d.cxx|9 +++-
3 files changed, 64 insertions(+), 12 deletions(-)
New commits:
commit b2c3233e5f267b5d244d722a94424a3b224b3314
Author: Tomaž Vajngerl
Date: Thu Dec 21 20:08:33 2017 +0900
chart2: suspend/resume setting rects dirty for 3D shapes
Previously we bypassed setting rects as dirty for a scene just
before we are about to create a 3D object. With this change we
do it earlier and suspend for the whole time we are creating the
scene - so we guarantee to o it for all 3D objects in that code
path. Aferwards we resume with setting rects and mark the whole
scene as dirty so we don't miss some update.
Change-Id: Ie4dec644102140edf282a2f5f6eb7fc9b81dbe48
Reviewed-on: https://gerrit.libreoffice.org/46901
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/chart2/source/view/charttypes/BarChart.cxx
b/chart2/source/view/charttypes/BarChart.cxx
index 34c28deb9057..17407d866a33 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -18,21 +18,24 @@
*/
#include "BarChart.hxx"
+#include "BarPositionHelper.hxx"
+
#include
#include
#include
#include
-#include "BarPositionHelper.hxx"
#include
#include
#include
#include
#include
+#include
#include
#include
#include
+#include
namespace chart
{
@@ -40,6 +43,27 @@ using namespace ::com::sun::star;
using namespace ::rtl::math;
using namespace ::com::sun::star::chart2;
+namespace
+{
+
+struct XShapeCompare
+{
+bool operator() (uno::Reference const & lhs,
uno::Reference const & rhs) const
+{
+return lhs.get() < rhs.get();
+}
+};
+
+struct XShapeHash
+{
+bool operator()(uno::Reference const & rXShape) const
+{
+return rXShape->getShapeType().hashCode();
+}
+};
+
+} // end anonymous namespace
+
BarChart::BarChart( const uno::Reference& xChartTypeModel
, sal_Int32 nDimensionCount )
: VSeriesPlotter( xChartTypeModel, nDimensionCount )
@@ -406,11 +430,11 @@ void
BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
}
}
-E3dScene* lcl_getE3dScene(uno::Reference const & xShapes)
+E3dScene* lcl_getE3dScene(uno::Reference const & xInterface)
{
E3dScene* pScene = nullptr;
-SvxShape* pSvxShape = SvxShape::getImplementation(xShapes);
+SvxShape* pSvxShape = SvxShape::getImplementation(xInterface);
if (pSvxShape)
{
SdrObject* pObject = pSvxShape->GetSdrObject();
@@ -453,6 +477,25 @@ void BarChart::createShapes()
bool bDrawConnectionLinesInited = false;
bool bOnlyConnectionLinesForThisPoint = false;
+std::unordered_set, XShapeHash,
XShapeCompare> aShapeSet;
+
+const comphelper::ScopeGuard aGuard([aShapeSet]() {
+
+std::unordered_set aSceneSet;
+
+for (uno::Reference const & rShape : aShapeSet)
+{
+E3dScene* pScene = lcl_getE3dScene(rShape);
+if (pScene)
+aSceneSet.insert(pScene->GetScene());
+}
+for (E3dScene* pScene : aSceneSet)
+{
+pScene->ResumeReportingDirtyRects();
+pScene->SetAllSceneRectsDirty();
+}
+});
+
adaptOverlapAndGapwidthForGroupBarsPerAxis();
//better performance for big data
@@ -585,8 +628,13 @@ void BarChart::createShapes()
bDrawConnectionLinesInited = true;
}
-uno::Reference< drawing::XShapes >
xSeriesGroupShape_Shapes(
-getSeriesGroupShape(pSeries, xSeriesTarget) );
+uno::Reference
xSeriesGroupShape_Shapes(getSeriesGroupShape(pSeries, xSeriesTarget));
+uno::Reference
xSeriesGroupShape(xSeriesGroupShape_Shapes, uno::UNO_QUERY);
+// Suspend setting rects dirty for the duration of this
call
+aShapeSet.insert(xSeriesGroupShape);
+E3dScene* pScene = lcl_getE3dScene(xSeriesGroupShape);
+if (pScene)
+pScene->SuspendReportingDirtyRects();
//collect data point information (logic coordinates, style
):
double fUnscaledLogicX = pSeries->getXValue( nPointIndex );
@@ -777,12 +825,9 @@ void BarChart::createShapes()
if( fTopHeight < 0 )
fTopHeight *= -1.0;
-E3dScene* pScene =
lcl_getE3dScene(xSeriesGroupShape_Shapes);
-pScene->EnterObjectSetupMode();
xShape = createDataPoint3D_Bar(
xSeriesGroupShape_Shapes,
aTransformedBottom, aSize, fTopHeight, nRotateZAngleHundredthDegree
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/elementary icon-themes/elementary_svg
icon-themes/breeze/sd/res/displaymode_xx.svg | 687 -- icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png |binary icon-themes/breeze/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png |binary icon-themes/elementary/res/notebookbar.png |binary icon-themes/elementary_svg/res/notebookbar.svg |1 7 files changed, 1 insertion(+), 687 deletions(-) New commits: commit 2c6d6c113177e25b9ae1674c1e8de0b3c8ae1327 Author: andreas kainz Date: Thu Dec 21 00:43:24 2017 +0100 Elementary Breeze-icon theme fixes Change-Id: Ieb154287f43e70dec747ecf4b5c7cd348883fe43 Reviewed-on: https://gerrit.libreoffice.org/46872 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/breeze/sd/res/displaymode_xx.svg b/icon-themes/breeze/sd/res/displaymode_xx.svg deleted file mode 100644 index 577941fc6690.. --- a/icon-themes/breeze/sd/res/displaymode_xx.svg +++ /dev/null @@ -1,687 +0,0 @@ - - - -http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="19.19mm" - height="15.24mm" - viewBox="0 0 67.98 53.99" - id="svg2" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="displaymode_handoutmaster.svg"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -image/svg+xml -http://purl.org/dc/dcmitype/StillImage"; /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png b/icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png new file mode 100644 index ..d18114641b3c Binary files /dev/null and b/icon-themes/breeze/sw/res/sidebar/pageproppanel/column_L_copy_24x24.png differ diff --git a/icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png b/icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png new file mode 100644 index ..3867cb7a915b Binary files /dev/null and b/icon-themes/breeze/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png differ diff --git a/icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png b/icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png new file mode 100644 index ..6484c117f43b Binary files /dev/null and b/icon-themes/breeze/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png differ diff --git a/icon-themes/breeze/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png b/icon-themes/breeze/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png new file mode 100644 index ..59373a888096 Binary files /dev/null and b/icon-themes/breeze/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png differ diff --git a/icon-themes/elementary/res/notebookbar.png b/icon-themes/elementary/res/notebookbar.png new file mode 100644 index ..679485448fab Binary files /dev/null and b/icon-themes/elementary/res/notebookbar.png differ diff --git a/icon-themes/elementary_svg/res/notebookbar.svg b/icon-themes/elementary_svg/res/notebookbar.svg new file mode 100644 index ..8d57888c7ca2 --- /dev/null +++ b/icon-themes/elementary_svg/res/notebookbar.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Blurry icons on HiDPI display (GNU/Linux)
Dear Caolán, On 12/17/17 15:33, Caolán McNamara wrote: On Fri, 2017-12-15 at 17:44 +0100, Paul Menzel wrote: Running LibreOffice 5.4.4.1 with GTK+ 3.22.26 on the HiDPI/4K monitor Dell U2718Q the icons in the toolbar are blurry as can be seen on the attached image. Is that expected? Probably, because these icons are pngs without higher res versions that could be used under hidpi. Unless we move over to using SVG icons I guess that's as good as it gets for now. We have svg versions of breeze, elementary and sifr sets I believe, and I think I see the svg tango source files for the tango pngs in icon-themes source dir. So we may have some capacity to do something nicer eventually via svg. Is the icon handling documented somewhere? Let’s take the icon *lc_autosum* as an example. ``` $ find . -name '*lc_autosum*' ./icon-themes/breeze/cmd/lc_autosum.png ./icon-themes/crystal/cmd/lc_autosum.png ./icon-themes/elementary/cmd/lc_autosum.png ./icon-themes/galaxy/cmd/lc_autosum.png ./icon-themes/hicontrast/cmd/lc_autosum.png ./icon-themes/oxygen/cmd/lc_autosum.png ./icon-themes/sifr/cmd/lc_autosum.png ./icon-themes/tango/cmd/lc_autosum.png ./icon-themes/tango/cmd/lc_autosum.svg ./icon-themes/breeze_dark/cmd/lc_autosum.png ./icon-themes/breeze_svg/cmd/lc_autosum.svg ./icon-themes/sifr_dark/cmd/lc_autosum.png ./icon-themes/elementary_svg/cmd/lc_autosum.svg $ identify ./icon-themes/tango/cmd/lc_autosum.png ./icon-themes/tango/cmd/lc_autosum.png PNG 24x24 24x24+0+0 8-bit sRGB 1.08KB 0.000u 0:00.000 ``` But I do not find any file with *autosum* in its name on the file system. Kind regards, Paul smime.p7s Description: S/MIME Cryptographic Signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/inc starmath/qa starmath/source
starmath/inc/node.hxx | 22 +++
starmath/qa/cppunit/test_node.cxx |4 -
starmath/qa/cppunit/test_parse.cxx | 14 ++---
starmath/source/cursor.cxx | 13 ++--
starmath/source/document.cxx |8 +-
starmath/source/mathmlexport.cxx | 16 +++--
starmath/source/mathmlimport.cxx |2
starmath/source/mathtype.cxx | 40 +-
starmath/source/node.cxx | 103 +
starmath/source/ooxmlexport.cxx|2
starmath/source/rtfexport.cxx |2
starmath/source/visitors.cxx |5 +
12 files changed, 124 insertions(+), 107 deletions(-)
New commits:
commit 585328a7136aaa4b98b9cac0355a2cd7e9078dec
Author: Caolán McNamara
Date: Thu Dec 21 09:57:46 2017 +
ofz#4703 Direct-leak
Change-Id: I5f3385d87aa5a48a8df3b6774dd1166cec60ebf8
Reviewed-on: https://gerrit.libreoffice.org/46893
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 0abc3736111a..260eec9e8943 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -122,9 +122,9 @@ public:
*/
virtual boolIsVisible() const = 0;
-virtual sal_uInt16 GetNumSubNodes() const = 0;
-virtual SmNode *GetSubNode(sal_uInt16 nIndex) = 0;
-const SmNode * GetSubNode(sal_uInt16 nIndex) const
+virtual size_t GetNumSubNodes() const = 0;
+virtual SmNode *GetSubNode(size_t nIndex) = 0;
+const SmNode * GetSubNode(size_t nIndex) const
{
return const_cast(this)->GetSubNode(nIndex);
}
@@ -231,10 +231,10 @@ public:
virtual boolIsVisible() const override;
-virtual sal_uInt16 GetNumSubNodes() const override;
+virtual size_t GetNumSubNodes() const override;
using SmNode::GetSubNode;
-virtual SmNode *GetSubNode(sal_uInt16 nIndex) override;
+virtual SmNode *GetSubNode(size_t nIndex) override;
void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird =
nullptr);
void SetSubNodes(const SmNodeArray &rNodeArray);
@@ -251,9 +251,9 @@ public:
*/
int IndexOfSubNode(SmNode const * pSubNode)
{
-sal_uInt16 nSize = GetNumSubNodes();
-for(sal_uInt16 i = 0; i < nSize; i++)
-if(pSubNode == GetSubNode(i))
+size_t nSize = GetNumSubNodes();
+for (size_t i = 0; i < nSize; i++)
+if (pSubNode == GetSubNode(i))
return i;
return -1;
}
@@ -294,9 +294,9 @@ protected:
public:
virtual boolIsVisible() const override;
-virtual sal_uInt16 GetNumSubNodes() const override;
+virtual size_t GetNumSubNodes() const override;
using SmNode::GetSubNode;
-virtual SmNode *GetSubNode(sal_uInt16 nIndex) override;
+virtual SmNode *GetSubNode(size_t nIndex) override;
};
@@ -859,7 +859,7 @@ public:
/** Get super- or subscript
* @remarks this method may return NULL.
*/
-SmNode * GetSubSup(SmSubSup eSubSup) { return GetSubNode(
sal::static_int_cast< sal_uInt16 >(1 + eSubSup) ); };
+SmNode * GetSubSup(SmSubSup eSubSup) { return GetSubNode(1 + eSubSup); };
const SmNode * GetSubSup(SmSubSup eSubSup) const { return const_cast<
SmSubSupNode* >( this )->GetSubSup( eSubSup ); }
/** Set the body */
diff --git a/starmath/qa/cppunit/test_node.cxx
b/starmath/qa/cppunit/test_node.cxx
index 0086dfe45fb3..2a35bdffbe4c 100644
--- a/starmath/qa/cppunit/test_node.cxx
+++ b/starmath/qa/cppunit/test_node.cxx
@@ -89,11 +89,11 @@ void NodeTest::testTdf52225()
#define CHECK_GREEK_SYMBOL(text, code, bItalic) do {\
mxDocShell->SetText(text); \
const SmTableNode *pTree= mxDocShell->GetFormulaTree(); \
-CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pTree->GetNumSubNodes()); \
+CPPUNIT_ASSERT_EQUAL(size_t(1), pTree->GetNumSubNodes()); \
const SmNode *pLine = pTree->GetSubNode(0); \
CPPUNIT_ASSERT(pLine); \
CPPUNIT_ASSERT_EQUAL(SmNodeType::Line, pLine->GetType()); \
-CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pLine->GetNumSubNodes()); \
+CPPUNIT_ASSERT_EQUAL(size_t(1), pLine->GetNumSubNodes()); \
const SmNode *pNode = pLine->GetSubNode(0); \
CPPUNIT_ASSERT(pNode); \
CPPUNIT_ASSERT_EQUAL(SmNodeType::Special, pNode->GetType());\
diff --git a/starmath/qa/cppunit/test_parse.cxx
b/starmath/qa/cppunit/test_parse.cxx
index cd014ab3ad72..c99a80568839 100644
--- a/starmath/qa/cppunit/test_parse.cxx
+++ b/starmath/qa/cppunit/test_parse.cxx
@@ -66,15 +66,15 @@ void ParseTest::tearDown()
void ParseTest::testMinus(
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/basedlgs.cxx |4 ++--
sfx2/source/dialog/tabdlg.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 10e73684468a811acae56dfeafc8ecb5876a7960
Author: Pranav Kant
Date: Tue Dec 5 01:24:21 2017 +0530
lokdialog: InitShow can happen multiple times
Change-Id: I120a49f8a3fa96eb93d6de6de1d0715134520678
(cherry picked from commit c24bfdbff68f52d65ca56cc4ff7d8377898180d7)
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 83ab4520e026..5379702e7d0a 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -173,7 +173,7 @@ void SfxModalDialog::dispose()
short SfxModalDialog::Execute()
{
SfxViewShell* pViewShell = SfxViewShell::Current();
-if (comphelper::LibreOfficeKit::isActive() && pViewShell)
+if (comphelper::LibreOfficeKit::isActive() && pViewShell &&
!GetLOKNotifier())
{
SetLOKNotifier(pViewShell);
const Size aSize = GetOptimalSize();
@@ -278,7 +278,7 @@ void SfxModelessDialog::StateChanged( StateChangedType
nStateChange )
}
SfxViewShell* pViewShell = SfxViewShell::Current();
-if (comphelper::LibreOfficeKit::isActive() && pViewShell)
+if (comphelper::LibreOfficeKit::isActive() && pViewShell &&
!GetLOKNotifier())
{
SetLOKNotifier(pViewShell);
std::vector aItems;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index c62a1c315e65..784a0c274b45 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -519,7 +519,7 @@ short SfxTabDialog::Execute()
Start_Impl();
SfxViewShell* pViewShell = SfxViewShell::Current();
-if (comphelper::LibreOfficeKit::isActive() && pViewShell)
+if (comphelper::LibreOfficeKit::isActive() && pViewShell &&
!GetLOKNotifier())
{
SetLOKNotifier(pViewShell);
const Size aSize = GetOptimalSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/backends/macbe/macbackend.hxx |4 ++--
shell/source/backends/macbe/macbackend.mm |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 292639d76e3eb47c8a94db17203d8b7d3cbacf37
Author: Stephan Bergmann
Date: Thu Dec 21 11:17:21 2017 +0100
loplugin:salcall (macOS)
Change-Id: Ic0b64c396356eb33ec42e65c71660d40e7dfcd40
Reviewed-on: https://gerrit.libreoffice.org/46892
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/shell/source/backends/macbe/macbackend.hxx
b/shell/source/backends/macbe/macbackend.hxx
index 0af641f13fef..b1bd910c21aa 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -50,14 +50,14 @@ public:
@return implementation name
*/
-static OUString SAL_CALL getBackendName();
+static OUString getBackendName();
/**
Provides the supported services names
@return service names
*/
-static uno::Sequence SAL_CALL getBackendServiceNames();
+static uno::Sequence getBackendServiceNames();
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
diff --git a/shell/source/backends/macbe/macbackend.mm
b/shell/source/backends/macbe/macbackend.mm
index 14628e91c728..5c5c0cfafae7 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -373,7 +373,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
}
}
-rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void)
+rtl::OUString MacOSXBackend::getBackendName(void)
{
return
rtl::OUString("com.sun.star.comp.configuration.backend.MacOSXBackend");
}
@@ -383,7 +383,7 @@ rtl::OUString SAL_CALL
MacOSXBackend::getImplementationName(void)
return getBackendName();
}
-uno::Sequence SAL_CALL
MacOSXBackend::getBackendServiceNames(void)
+uno::Sequence MacOSXBackend::getBackendServiceNames(void)
{
uno::Sequence aServiceNameList {
"com.sun.star.configuration.backend.MacOSXBackend" };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/customize/SvxConfigPageHelper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1d55c1baed9977bad449691012807c6f09e2fca8
Author: Maxim Monastirsky
Date: Thu Dec 21 12:50:42 2017 +0200
tdf#106784 Also handle automatic icon size
... like before b1426b5b502fd591402d666994e3f1fb3a8ad959
("tdf#95014 initial support for 32 px icons in toolbar").
The original code used SvtMiscOptions::AreCurrentSymbolsLarge()
which calls GetCurrentSymbolsSize() internally, thus properly
resolves the icon size, when the current setting is "automatic".
Change-Id: Iabcbbcff666eecc2e7534eb1533610f08ac28bf1
Reviewed-on: https://gerrit.libreoffice.org/46899
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx
b/cui/source/customize/SvxConfigPageHelper.cxx
index 9738b20c595f..334bef8f7cf1 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -68,11 +68,11 @@ void SvxConfigPageHelper::InitImageType()
css::ui::ImageType::COLOR_NORMAL |
css::ui::ImageType::SIZE_DEFAULT;
-if (SvtMiscOptions().GetSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE)
+if (SvtMiscOptions().GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE)
{
theImageType |= css::ui::ImageType::SIZE_LARGE;
}
-else if (SvtMiscOptions().GetSymbolsSize() == SFX_SYMBOLS_SIZE_32)
+else if (SvtMiscOptions().GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_32)
{
theImageType |= css::ui::ImageType::SIZE_32;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/python/text_portion_enumeration_test.py | 21 +++-
sw/source/core/unocore/unoportenum.cxx| 111 ++
2 files changed, 112 insertions(+), 20 deletions(-)
New commits:
commit 76a4305d1e90b6617054dd33036e64f005dbcf04
Author: Miklos Vajna
Date: Thu Dec 21 09:32:13 2017 +0100
sw: fix inconsistent bookmark behavior around at-char/as-char anchored
frames
We have a placeholder character in the sw doc model for as-char anchored
frames, so it's possible to have a bookmark before/after the frame or a
non-collapsed bookmark which covers the frame.
The same is not true for at-char anchored frames, where the anchor
points to a doc model position, but there is no placeholder character.
If a bookmark is created covering the start and end of the anchor of the
frame, internally we create a collapsed bookmark which has the same
position as the anchor of the frame. When this doc model is handled by
SwXParagraph::createEnumeration(), first the frame and then the bookmark
is appended to the text portion enumeration, so your bookmark around the
frame is turned into a collapsed bookmark after the frame. (The same
happens when we roundtrip an ODT document representing this doc model.)
Fix the problem by inserting collapsed bookmarks with affected anchor
positions (same position is the anchor for an at-char frame) into the
enumeration in two stages: first the start of them before frames and
then the end of them + other bookmarks. This way UNO API users get their
non-collapsed bookmarks around at-char anchored frames, similar to
as-char ones.
Change-Id: Ic1f173c85d3824afabb5b7ebf3a8594311eb9007
Reviewed-on: https://gerrit.libreoffice.org/46889
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/python/text_portion_enumeration_test.py
b/sw/qa/python/text_portion_enumeration_test.py
index d6774629f96a..f5a9a56550d9 100644
--- a/sw/qa/python/text_portion_enumeration_test.py
+++ b/sw/qa/python/text_portion_enumeration_test.py
@@ -1429,8 +1429,9 @@ class TextPortionEnumerationTest(unittest.TestCase):
name5 = self.mkname("frame")
root = TreeNode()
root.appendchild(TextNode("abc"))
-root.appendchild(BookmarkNode(name1))
+root.appendchild(BookmarkStartNode(name1))
root.appendchild(FrameNode(name2, AT_CHARACTER))
+root.appendchild(BookmarkEndNode(name1))
root.appendchild(ReferenceMarkNode(name3))
root.appendchild(FrameNode(name4, AT_CHARACTER))
root.appendchild(FrameNode(name5, AT_CHARACTER))
@@ -1479,12 +1480,14 @@ class TextPortionEnumerationTest(unittest.TestCase):
root = TreeNode()
root.appendchild(ReferenceMarkNode(name1))
root.appendchild(DocumentIndexMarkNode(name2))
-root.appendchild(BookmarkNode(name3))
+root.appendchild(BookmarkStartNode(name3))
root.appendchild(FrameNode(name4, AT_CHARACTER))
+root.appendchild(BookmarkEndNode(name3))
root.appendchild(ReferenceMarkNode(name7))
root.appendchild(DocumentIndexMarkNode(name8))
-root.appendchild(BookmarkNode(name9))
+root.appendchild(BookmarkStartNode(name9))
root.appendchild(FrameNode(nameA, AT_CHARACTER))
+root.appendchild(BookmarkEndNode(name9))
self.dotest(root)
def test_empty2(self):
@@ -1493,10 +1496,12 @@ class TextPortionEnumerationTest(unittest.TestCase):
name9 = self.mkname("bookmark")
nameA = self.mkname("frame")
root = TreeNode()
-root.appendchild(BookmarkNode(name3))
+root.appendchild(BookmarkStartNode(name3))
root.appendchild(FrameNode(name4, AT_CHARACTER))
-root.appendchild(BookmarkNode(name9))
+root.appendchild(BookmarkEndNode(name3))
+root.appendchild(BookmarkStartNode(name9))
root.appendchild(FrameNode(nameA, AT_CHARACTER))
+root.appendchild(BookmarkEndNode(name9))
self.dotest(root)
def test_empty3(self):
@@ -1513,8 +1518,9 @@ class TextPortionEnumerationTest(unittest.TestCase):
root = TreeNode()
root.appendchild(ReferenceMarkNode(name1))
root.appendchild(DocumentIndexMarkNode(name2))
-root.appendchild(BookmarkNode(name3))
+root.appendchild(BookmarkStartNode(name3))
root.appendchild(FrameNode(name4, AT_CHARACTER))
+root.appendchild(BookmarkEndNode(name3))
## currently empty hyperlinks may get eaten...
# href = HyperlinkNode(name5)
# href.appendchild(TextNode(""))
@@ -1523,8 +1529,9 @@ class TextPortionEnumerationTest(unittest.TestCase):
root.appendchild(ruby)
root.appendchild(ReferenceMarkNode(name7))
root.appendchild(DocumentIndexMarkNode(name8))
-root.appendchild(BookmarkNode(name9))
+root.appendchild(BookmarkStartNode(name9))
root.appendchild
[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-6.0.0.1'
Tag 'libreoffice-6.0.0.1' created by Andras Timar at 2017-12-21 11:21 + libreoffice-6.0.0.1 Changes since libreoffice-6.0.0.0.beta1-9: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - 3 commits - configure.ac loleaflet/po
configure.ac |2 loleaflet/po/styles/af.po |4 + loleaflet/po/styles/am.po |4 + loleaflet/po/styles/ar.po |4 + loleaflet/po/styles/as.po |4 + loleaflet/po/styles/ast.po |4 + loleaflet/po/styles/be.po |4 + loleaflet/po/styles/bg.po |4 + loleaflet/po/styles/bn-IN.po |4 + loleaflet/po/styles/bn.po |4 + loleaflet/po/styles/bo.po |4 + loleaflet/po/styles/br.po |4 + loleaflet/po/styles/bs.po |4 + loleaflet/po/styles/ca-valencia.po |4 + loleaflet/po/styles/ca.po |4 + loleaflet/po/styles/cs.po |4 + loleaflet/po/styles/cy.po |4 + loleaflet/po/styles/da.po |4 + loleaflet/po/styles/de.po |4 + loleaflet/po/styles/dgo.po |4 + loleaflet/po/styles/dz.po |4 + loleaflet/po/styles/el.po |4 + loleaflet/po/styles/eo.po |4 + loleaflet/po/styles/es.po |4 + loleaflet/po/styles/et.po |4 + loleaflet/po/styles/eu.po |4 + loleaflet/po/styles/fa.po |4 + loleaflet/po/styles/fi.po |4 + loleaflet/po/styles/fr.po |4 + loleaflet/po/styles/ga.po |4 + loleaflet/po/styles/gd.po |4 + loleaflet/po/styles/gl.po |4 + loleaflet/po/styles/gu.po |4 + loleaflet/po/styles/gug.po |4 + loleaflet/po/styles/he.po |4 + loleaflet/po/styles/hi.po |4 + loleaflet/po/styles/hr.po |4 + loleaflet/po/styles/hu.po |4 + loleaflet/po/styles/id.po |4 + loleaflet/po/styles/is.po |4 + loleaflet/po/styles/it.po |4 + loleaflet/po/styles/ja.po |4 + loleaflet/po/styles/kk.po |4 + loleaflet/po/styles/km.po |4 + loleaflet/po/styles/kmr-Latn.po|4 + loleaflet/po/styles/kn.po |4 + loleaflet/po/styles/ko.po |4 + loleaflet/po/styles/lb.po |4 + loleaflet/po/styles/lt.po |4 + loleaflet/po/styles/lv.po |4 + loleaflet/po/styles/mk.po |4 + loleaflet/po/styles/ml.po |4 + loleaflet/po/styles/mn.po |4 + loleaflet/po/styles/mr.po |4 + loleaflet/po/styles/my.po |4 + loleaflet/po/styles/nb.po |4 + loleaflet/po/styles/ne.po |4 + loleaflet/po/styles/nl.po |4 + loleaflet/po/styles/nn.po |4 + loleaflet/po/styles/nso.po |4 + loleaflet/po/styles/oc.po |4 + loleaflet/po/styles/om.po |4 + loleaflet/po/styles/or.po |4 + loleaflet/po/styles/pa-IN.po |4 + loleaflet/po/styles/pl.po |4 + loleaflet/po/styles/pt-BR.po |4 + loleaflet/po/styles/pt.po |4 + loleaflet/po/styles/ro.po |4 + loleaflet/po/styles/ru.po |4 + loleaflet/po/styles/sa-IN.po |4 + loleaflet/po/styles/sat.po |4 + loleaflet/po/styles/sd.po |4 + loleaflet/po/styles/si.po |4 + loleaflet/po/styles/sid.po |4 + loleaflet/po/styles/sk.po |4 + loleaflet/po/styles/sl.po |4 + loleaflet/po/styles/sq.po |4 + loleaflet/po/styles/sr-Latn.po |4 + loleaflet/po/styles/sr.po |4 + loleaflet/po/styles/sv.po |4 + loleaflet/po/styles/ta.po |4 + loleaflet/po/styles/te.po |4 + loleaflet/po/styles/th.po |4 + loleaflet/po/styles/tr.po |4 + loleaflet/po/styles/ug.po |4 + loleaflet/po/styles/uk.po |4 + loleaflet/po/styles/uz.po |4 + loleaflet/po/styles/vi.po |4 + loleaflet/po/styles/zh-CN.po |4 + loleaflet/po/styles/zh-TW.po |4 + loleaflet/po/styles/zu.po |4 + loleaflet/po/ui-ab.po |6 +- loleaflet/po/ui-de.po | 11 ++- loleaflet/po/ui-eo.po |4 - loleaflet/po/ui-fr.po | 12 ++-- loleaflet/po/ui-hu.po |6 +- loleaflet/po/ui-pt.po | 107 + loleaflet/po/ui-uk.po |7 +- loleaflet/po/ui-zh_TW.po |8 +- 99 files changed, 440 insertions(+), 83 deletions(-) New commits: commit e01446c5e850fa2a6af06e546b54c4385a2c5cfe Author: Andras Timar Date: Thu Dec 21 12:07:36 2017 +0100 Bump version to 6.0.0.1 Change-Id: Ic1c90292cf1e02aae1e9caa786228670eb031d92 diff --git a/configure.ac b/configure.ac index ec232e24..4989beea 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) -AC_INIT([libreoffice-online], [6.0.0.0.beta1], [libreoffice@lists.freedesktop.o
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7b7ccb71384d2fdb5a7f076129d89ef78636d67 Author: Aron Budea Date: Wed Dec 20 12:06:39 2017 +0100 tdf#104229: properly switch to def sidebar deck on status change regression since a64999511ae654131d997eec9a3d78478cfc1c75 Change-Id: Id1d0a76f89c41e88511f670f1aac4b866e4c15c6 Reviewed-on: https://gerrit.libreoffice.org/46840 Tested-by: Jenkins Reviewed-by: Katarina Behrens (cherry picked from commit f2f5ebcee462472b27b610f53abc7f9a6378462b) Reviewed-on: https://gerrit.libreoffice.org/46900 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 0195c496fccc..b05de0deed01 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -302,7 +302,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv // Force the current deck to update its panel list. if ( ! mbIsDocumentReadOnly) -msCurrentDeckId = gsDefaultDeckId; +SwitchToDefaultDeck(); mnRequestedForceFlags |= SwitchFlag_ForceSwitch; maAsynchronousDeckSwitch.CancelRequest(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca5179ed5a4b6f939001e0fb646b1591d944ead3 Author: Marco A.G.Pinto Date: Tue Dec 19 18:25:20 2017 + Updated core Project: dictionaries f8a5164d94594d7a36eccd5a2504b76c67e6d2c1 Added maintainer name and Extension URL to English dictionaries. Change-Id: I42a2309aefabe04f745605fd8c472f504fa67712 Reviewed-on: https://gerrit.libreoffice.org/46805 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/dictionaries b/dictionaries index 7ac9dd36dcba..f8a5164d9459 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 7ac9dd36dcbaef021399b8328d25c8a1ab000e83 +Subproject commit f8a5164d94594d7a36eccd5a2504b76c67e6d2c1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: en/description.xml
en/description.xml |3 +++ 1 file changed, 3 insertions(+) New commits: commit f8a5164d94594d7a36eccd5a2504b76c67e6d2c1 Author: Marco A.G.Pinto Date: Tue Dec 19 18:25:20 2017 + Added maintainer name and Extension URL to English dictionaries. Change-Id: I42a2309aefabe04f745605fd8c472f504fa67712 Reviewed-on: https://gerrit.libreoffice.org/46805 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/en/description.xml b/en/description.xml index 9b58e6a..1ed630f 100644 --- a/en/description.xml +++ b/en/description.xml @@ -12,4 +12,7 @@ + +https://extensions.libreoffice.org/extensions/english-dictionaries"; lang="en">Marco A.G.Pinto + ___ 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' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6054c390d136cea5d79b429447e262f61e4a3f19 Author: Aron Budea Date: Wed Dec 20 12:06:39 2017 +0100 tdf#104229: properly switch to def sidebar deck on status change regression since a64999511ae654131d997eec9a3d78478cfc1c75 Change-Id: Id1d0a76f89c41e88511f670f1aac4b866e4c15c6 Reviewed-on: https://gerrit.libreoffice.org/46840 Tested-by: Jenkins Reviewed-by: Katarina Behrens (cherry picked from commit f2f5ebcee462472b27b610f53abc7f9a6378462b) Reviewed-on: https://gerrit.libreoffice.org/46884 diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 66850a562021..466d45d53cc5 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -306,7 +306,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv // Force the current deck to update its panel list. if ( ! mbIsDocumentReadOnly) -msCurrentDeckId = gsDefaultDeckId; +SwitchToDefaultDeck(); mnRequestedForceFlags |= SwitchFlag_ForceSwitch; maAsynchronousDeckSwitch.CancelRequest(); ___ 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' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bc50d17eb5aaeaaa81255eb5cee6fb60f99c7bc Author: Aron Budea Date: Wed Dec 20 12:06:39 2017 +0100 tdf#104229: properly switch to def sidebar deck on status change regression since a64999511ae654131d997eec9a3d78478cfc1c75 Change-Id: Id1d0a76f89c41e88511f670f1aac4b866e4c15c6 Reviewed-on: https://gerrit.libreoffice.org/46840 Tested-by: Jenkins Reviewed-by: Katarina Behrens (cherry picked from commit f2f5ebcee462472b27b610f53abc7f9a6378462b) Reviewed-on: https://gerrit.libreoffice.org/46881 diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index b0610ae203d9..5752120038a4 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -307,7 +307,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv // Force the current deck to update its panel list. if ( ! mbIsDocumentReadOnly) -msCurrentDeckId = gsDefaultDeckId; +SwitchToDefaultDeck(); mnRequestedForceFlags |= SwitchFlag_ForceSwitch; maAsynchronousDeckSwitch.CancelRequest(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - loleaflet/src
loleaflet/src/layer/tile/CalcTileLayer.js |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 489f43d1ce9ab4f3224d380c15b75a0288f4d5b1
Author: Marco Cecchetti
Date: Mon Dec 18 21:50:37 2017 +0100
loleaflet: calc: wrong data in firing of updaterowcolumnheaders event
two fixes:
- wrong data in firing of updaterowcolumnheaders event (messing up
pg-up/pg-down)
- console error message about invocation of a method for an undefined
object (annotation.mark)
Change-Id: I4e7d9de38ffe18b477c99147966fd91d7a460841
Reviewed-on: https://gerrit.libreoffice.org/46744
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
Reviewed-on: https://gerrit.libreoffice.org/46898
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index a863e4a1..f75cf787 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -211,7 +211,7 @@ L.CalcTileLayer = L.TileLayer.extend({
this._map.fire('updaterowcolumnheaders', {x: 0, y:
this._map._getTopLeftPoint().y, offset: {x: 0, y: undefined}});
this._map._socket.sendMessage('commandvalues
command=.uno:ViewAnnotationsPosition');
} else if (textMsg.startsWith('invalidateheader: all')) {
- this._map.fire('updaterowcolumnheaders', {x:
this._map._getTopLeftPoint().x, y: this._map._getTopLeftPoint(), offset: {x:
undefined, y: undefined}});
+ this._map.fire('updaterowcolumnheaders', {x:
this._map._getTopLeftPoint().x, y: this._map._getTopLeftPoint().y, offset: {x:
undefined, y: undefined}});
this._map._socket.sendMessage('commandvalues
command=.uno:ViewAnnotationsPosition');
} else {
L.TileLayer.prototype._onMessage.call(this, textMsg,
img);
@@ -464,7 +464,9 @@ L.CalcTileLayer = L.TileLayer.extend({
var annotation =
this._annotations[comment.tab][comment.id];
if (annotation) {
annotation.setLatLngBounds(comment.cellPos);
-
annotation.mark.setLatLng(comment.cellPos.getNorthEast());
+ if (annotation.mark) {
+
annotation.mark.setLatLng(comment.cellPos.getNorthEast());
+ }
}
}
this.showAnnotations();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - loleaflet/src
loleaflet/src/control/Control.Header.js |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d18e4e1c4ca3d952d79d425cd5ee662e33e38cdd
Author: Marco Cecchetti
Date: Sun Dec 17 19:03:51 2017 +0100
calc: fixing auto optimal size on double-click
Change-Id: I6341c617037cd876667681d4495f77e75cad8388
Reviewed-on: https://gerrit.libreoffice.org/46718
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
Reviewed-on: https://gerrit.libreoffice.org/46897
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.Header.js
b/loleaflet/src/control/Control.Header.js
index d3b9c32d..7af14c3b 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -293,6 +293,10 @@ L.Control.Header = L.Control.extend({
this.onDragMove(this._item, this._start, this._offset, e);
},
+ _resetClickCount: function () {
+ this._clicks = 0;
+ },
+
_onMouseUp: function (e) {
L.DomEvent.off(document, 'mousemove', this._onMouseMove, this);
L.DomEvent.off(document, 'mouseup', this._onMouseUp, this);
@@ -308,7 +312,7 @@ L.Control.Header = L.Control.extend({
this._clicks = 0;
} else {
this.onDragClick(this._item, ++this._clicks, e);
- setTimeout(L.bind(this.initialize, this), 400);
+ setTimeout(L.bind(this._resetClickCount, this), 400);
}
this._item = this._start = this._offset = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - loleaflet/src
loleaflet/src/control/Control.Header.js | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 510454c66bab6965cb618311cdcc5fac1f29d4e1
Author: Marco Cecchetti
Date: Fri Dec 1 12:29:35 2017 +0100
loleaflet: calc: fix styles fetching in browsers different from Chrome
'font', 'border-width', 'border-color' are shortcut properties that
are available on Chrome but not on other browsers such as Firefox or
Edge.
Change-Id: I22d2a3db87b9d6f888bd345e06e605530358be51
Reviewed-on: https://gerrit.libreoffice.org/45665
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
Reviewed-on: https://gerrit.libreoffice.org/46896
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.Header.js
b/loleaflet/src/control/Control.Header.js
index a94663a2..d3b9c32d 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -24,10 +24,14 @@ L.Control.Header = L.Control.extend({
var elem = L.DomUtil.create('div', className, baseElem);
this._textColor = L.DomUtil.getStyle(elem, 'color');
this._backgroundColor = L.DomUtil.getStyle(elem,
'background-color');
- this._font = L.DomUtil.getStyle(elem, 'font');
- this._borderColor = L.DomUtil.getStyle(elem, 'border-color');
- var borderWidth = L.DomUtil.getStyle(elem, 'border-width');
- this._borderWidth = parseInt(borderWidth.slice(0, -2));
+ var fontFamily = L.DomUtil.getStyle(elem, 'font-family');
+ var fontSize = parseInt(L.DomUtil.getStyle(elem, 'font-size'));
+ var fontHeight = parseInt(L.DomUtil.getStyle(elem,
'line-height'));
+ var rate = fontHeight / fontSize;
+ this._font = fontSize + 'px/' + rate + ' ' + fontFamily;
+ this._borderColor = L.DomUtil.getStyle(elem,
'border-top-color');
+ var borderWidth = L.DomUtil.getStyle(elem, 'border-top-width');
+ this._borderWidth = parseInt(borderWidth);
this._cursor = L.DomUtil.getStyle(elem, 'cursor');
L.DomUtil.remove(elem);
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - loleaflet/dist
loleaflet/dist/images/lc_insertfootnote.svg |1 -
loleaflet/dist/toolbar.css |1 -
loleaflet/dist/toolbar/toolbar.js | 16
3 files changed, 18 deletions(-)
New commits:
commit c66e5f53fc7563df4de24518286f767f8221fcba
Author: Andras Timar
Date: Mon Mar 27 15:46:14 2017 +0200
Revert "Add footnote and text wrap functions"
Change-Id: I59d374d3f8bdfa6a3b871bdec5389a53bb3a9da9
Reviewed-on: https://gerrit.libreoffice.org/46895
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/dist/images/lc_insertfootnote.svg
b/loleaflet/dist/images/lc_insertfootnote.svg
deleted file mode 100644
index 9907b8b3..
--- a/loleaflet/dist/images/lc_insertfootnote.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 31d3d209..6564ae95 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -285,7 +285,6 @@ button.leaflet-control-search-next
.w2ui-icon.save{ background: url('../images/lc_save.svg') no-repeat center
!important; }
.w2ui-icon.saveas{ background: url('../images/lc_saveas.svg') no-repeat center
!important; }
.w2ui-icon.strikeout{ background: url('../images/lc_strikeout.svg') no-repeat
center !important; }
-.w2ui-icon.insertfootnote{ background: url('../images/lc_insertfootnote.svg')
no-repeat center !important; }
.w2ui-icon.underline{ background: url('../images/lc_underline.svg') no-repeat
center !important; }
.w2ui-icon.undo{ background: url('../images/lc_undo.svg') no-repeat center
!important; }
.w2ui-icon.zoomin{ background: url('../images/plus.svg') no-repeat center
!important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 865a6efe..cb0b51a7 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -284,11 +284,6 @@ function onClick(id, item, subItem) {
else if (id === 'lastrecord') {
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
}
- else if (id.startsWith('menu:wrap:wrap-'))
- {
- var wrapType = id.substring('menu:wrap:wrap-'.length);
- map.toggleCommandState(wrapType);
- }
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
@@ -458,15 +453,6 @@ $(function () {
name: 'toolbar-up',
items: [
{type: 'html', id: 'left'},
- {type: 'menu', id: 'writer:menu:wrap', caption:
_('Textwrap'), items: [
- { text: _('No wrap'), id: 'wrap-WrapOff' },
- { text: _('Page wrap'), id: 'wrap-WrapOn' },
- { text: _('Wrap anchor only'), id:
'wrap-WrapAnchorOnly' },
- { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
- { text: _('Left wrap'), id: 'wrap-WrapLeft' },
- { text: _('Right wrap'), id: 'wrap-WrapRight' },
- { text: _('Wrap through'), id:
'wrap-WrapThrough' }
- ]},
{type: 'button', id: 'save', img: 'save', hint:
_('Save')},
{type: 'break', id: 'savebreak'},
{type: 'button', id: 'undo', img: 'undo', hint:
_('Undo'), uno: 'Undo', disabled: true},
@@ -482,8 +468,6 @@ $(function () {
{type: 'button', id: 'underline', img: 'underline',
hint: _('Underline'), uno: 'Underline', disabled: true},
{type: 'button', id: 'strikeout', img: 'strikeout',
hint: _('Strikeout'), uno: 'Strikeout', disabled: true},
{type: 'break', id: 'formatbreak'},
- {type: 'button', id: 'insertfootnote', img:
'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
- {type: 'break' },
{type: 'html', id: 'fontcolor-html', html: ''},
{type: 'button', id: 'fontcolor', img: 'color', hint:
_('Font color')},
{type: 'html', id: 'backcolor-html', html: ''},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-0' - bundled/include common/Message.hpp kit/ChildSession.cpp kit/ChildSession.hpp kit/Kit.cpp kit/KitHelper.hpp loleaflet/build loleaflet/debug
bundled/include/LibreOfficeKit/LibreOfficeKit.h | 42 -- bundled/include/LibreOfficeKit/LibreOfficeKit.hxx| 105 - bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h | 23 - bundled/include/LibreOfficeKit/LibreOfficeKitInit.h |1 common/Message.hpp |4 kit/ChildSession.cpp | 106 + kit/ChildSession.hpp | 12 kit/Kit.cpp | 112 -- kit/KitHelper.hpp|4 loleaflet/build/deps.js |3 loleaflet/debug/document/loleaflet.html |2 loleaflet/dist/loleaflet.css | 17 loleaflet/main.js|3 loleaflet/src/control/Control.Dialog.js |6 loleaflet/src/control/Control.LokDialog.js | 349 --- loleaflet/src/control/Control.Menubar.js | 21 - loleaflet/src/control/Toolbar.js | 14 loleaflet/src/core/Socket.js | 14 loleaflet/src/layer/tile/TileLayer.js| 52 -- tools/KitClient.cpp |2 wsd/ClientSession.cpp| 11 wsd/DocumentBroker.cpp | 40 -- wsd/DocumentBroker.hpp |2 wsd/protocol.txt |4 24 files changed, 40 insertions(+), 909 deletions(-) New commits: commit 82d5d38708088126391c700b11c92578f6dd1502 Author: Jan Holesovsky Date: Thu Dec 21 11:02:38 2017 +0100 Revert the incomplete dialog tunneling, the API has changed completely. Change-Id: I8ad2005bffd43ea0ef9bdf6c2e76caa9debd7041 Reviewed-on: https://gerrit.libreoffice.org/46894 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/bundled/include/LibreOfficeKit/LibreOfficeKit.h index 14824821..0633f46f 100644 --- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h +++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h @@ -266,48 +266,6 @@ struct _LibreOfficeKitDocumentClass int* pArray, size_t nSize); -/// Paints dialog with given dialog id to the buffer -/// @see lok::Document::paintDialog(). -void (*paintDialog) (LibreOfficeKitDocument* pThis, const char* pDialogId, - unsigned char* pBuffer, - const int x, const int y, - const int width, const int height); - -/// Get info about dialog with given dialog id -/// @see lok::Document::getDialogInfo(). -void (*getDialogInfo) (LibreOfficeKitDocument* pThis, const char* pDialogId, - char** pDialogTitle, int* pWidth, int* pHeight); - -/// @see lok::Document::paintActiveFloatingWindow(). -void (*paintActiveFloatingWindow) (LibreOfficeKitDocument* pThis, const char* pDialogId, unsigned char* pBuffer, int* nWidth, int* nHeight); - -/// @see lok::Document::postDialogKeyEvent(). -void (*postDialogKeyEvent) (LibreOfficeKitDocument* pThis, -const char* pDialogId, -int nType, -int nCharCode, -int nKeyCode); - -/// @see lok::Document::postDialogMouseEvent(). -void (*postDialogMouseEvent) (LibreOfficeKitDocument* pThis, - const char* pDialogId, - int nType, - int nX, - int nY, - int nCount, - int nButtons, - int nModifier); - -/// @see lok::Document::postDialogChildMouseEvent(). -void (*postDialogChildMouseEvent) (LibreOfficeKitDocument* pThis, - const char* pDialogId, - int nType, - int nX, - int nY, - int nCount, - int nButtons, - int nModifier); - #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx index 19e121fe..0781e7d1 100644 --- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -156,65 +156,6 @@ public: } /** - * Renders a dialog with give dialog id and writes the width and height of the rendered dialog - * - * Client must truncate pBuffer according to the nWidth and
[Libreoffice-commits] core.git: chart2/source include/svx sc/source sd/source svx/source sw/source
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |3
include/svx/svxids.hrc| 101 +-
sc/source/ui/view/cellsh3.cxx |2
sc/source/ui/view/formatsh.cxx| 10
sd/source/ui/view/drviewse.cxx|2
svx/source/svdraw/svdedtv1.cxx|6
svx/source/table/tablecontroller.cxx |4
sw/source/core/unocore/unoobj2.cxx|2
sw/source/core/unocore/unostyle.cxx |2
sw/source/ui/chrdlg/tblnumfm.cxx |2
sw/source/uibase/shells/basesh.cxx|4
sw/source/uibase/shells/tabsh.cxx |6
sw/source/uibase/uiview/pview.cxx |6
sw/source/uibase/uiview/viewtab.cxx |4
14 files changed, 81 insertions(+), 73 deletions(-)
New commits:
commit 956dd4a202a0897b7ca1f8abd285af2cad47abb2
Author: Noel Grandin
Date: Wed Dec 20 15:53:37 2017 +0200
TypedWhichId in svx part 2
Change-Id: Id927679c9f07f1dd820f4fdca9a45eb7aede037c
Reviewed-on: https://gerrit.libreoffice.org/46850
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 13c8c2246ab3..aa168a51e6e2 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -926,8 +926,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16
nWhichId, const SfxItemSet
if( aState == SfxItemState::SET )
{
sal_Int32 nFormatKey = static_cast< sal_Int32 >(
-static_cast< const SfxUInt32Item & >(
-rItemSet.Get( SID_ATTR_NUMBERFORMAT_VALUE
)).GetValue());
+rItemSet.Get( SID_ATTR_NUMBERFORMAT_VALUE
).GetValue());
aValue <<= nFormatKey;
}
else
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index a98b1b644ba9..07e808c37627 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -26,6 +26,12 @@
#include
#include
+class SfxInt32Item;
+class SfxAllEnumItem;
+class SfxPointItem;
+class SfxBoolItem;
+class SfxUInt32Item;
+class SfxRectangleItem;
class SvxPageItem;
class SvxSizeItem;
class SvxLongULSpaceItem;
@@ -34,6 +40,17 @@ class SvxPostItAuthorItem;
class SvxPostItDateItem;
class SvxPostItTextItem;
class SvxPostItIdItem;
+class SvxColorListItem;
+class SvxColorItem;
+class SvxGradientListItem;
+class SvxRulerItem;
+class SvxNumberInfoItem;
+class SvxHatchListItem;
+class SvxBitmapListItem;
+class SvxPatternListItem;
+class SvxDashListItem;
+class SvxLineEndListItem;
+class SvxLineItem;
// member IDs
@@ -245,23 +262,23 @@ class SvxPostItIdItem;
// CAUTION! Range <64 .. 67> used by EditEngine (!)
#define SID_RULER_CHANGE_STATE ( SID_SVX_START + 78 )
-#define SID_RULER_NULL_OFFSET ( SID_SVX_START + 79 )
-#define SID_RULER_BORDERS ( SID_SVX_START + 80 )
-#define SID_RULER_OBJECT( SID_SVX_START + 81 )
-#define SID_RULER_PAGE_POS ( SID_SVX_START + 82 )
-#define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 )
-#define SID_RULER_LR_MIN_MAX( SID_SVX_START + 84 )
-#define SID_ATTR_NUMBERFORMAT_VALUE ( SID_SVX_START + 85 )
-#define SID_ATTR_NUMBERFORMAT_INFO ( SID_SVX_START + 86 )
-#define SID_ATTR_TRANSFORM ( SID_SVX_START + 87 )
-#define SID_ATTR_TRANSFORM_POS_X( SID_SVX_START + 88 )
-#define SID_ATTR_TRANSFORM_POS_Y( SID_SVX_START + 89 )
-#define SID_ATTR_TRANSFORM_WIDTH( SID_SVX_START + 90 )
-#define SID_ATTR_TRANSFORM_HEIGHT ( SID_SVX_START + 91 )
-#define SID_ATTR_TRANSFORM_SIZE_POINT ( SID_SVX_START + 92 )
-#define SID_ATTR_TRANSFORM_ROT_X( SID_SVX_START + 93 )
-#define SID_ATTR_TRANSFORM_ROT_Y( SID_SVX_START + 94 )
-#define SID_ATTR_TRANSFORM_ANGLE( SID_SVX_START + 95 )
+#define SID_RULER_NULL_OFFSET
TypedWhichId( SID_SVX_START + 79 )
+#define SID_RULER_BORDERS
TypedWhichId( SID_SVX_START + 80 )
+#define SID_RULER_OBJECT
TypedWhichId( SID_SVX_START + 81 )
+#define SID_RULER_PAGE_POS
TypedWhichId( SID_SVX_
[Libreoffice-commits] core.git: filter/source sc/source sw/source
filter/source/msfilter/msdffimp.cxx |2 +-
sc/source/core/tool/interpr3.cxx|2 +-
sw/source/core/txtnode/thints.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 648c8001783603d708af9e9552a51d2334fc6c2e
Author: Andrea Gelmini
Date: Wed Dec 20 17:37:03 2017 +0100
Fix typo
Change-Id: I15b44b42d31eaebd2a8cea29fdaa843c9bd21b73
Reviewed-on: https://gerrit.libreoffice.org/46857
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 5342110a30f2..ac7de6b6034f 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3364,7 +3364,7 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32
nColorCode, sal_uInt16 nConte
sal_uInt8 nUpper = (sal_uInt8)( nColorCode >> 24 );
// sj: below change from 0x1b to 0x19 was done because of i84812 (0x02 ->
rgb color),
-// now I have some problems to fix i104685 (there the color value is
0x0200 whichs requires
+// now I have some problems to fix i104685 (there the color value is
0x0200 which requires
// a 0x2 scheme color to be displayed properly), the color docu seems to
be incomplete
if( nUpper & 0x19 ) // if( nUpper & 0x1f )
{
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 7c9753cae3b7..bf989bb94baa 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -154,7 +154,7 @@ static double lcl_IterateInverse( const ScDistFunc&
rFunction, double fAx, doubl
{
fAx = fRx; fAy = fRy;
}
-// if last interation brought to small advance, then do bisection next
+// if last iteration brought to small advance, then do bisection next
// time, for safety
bHasToInterpolate = bHasToInterpolate && (fabs(fRy) * 2.0 <=
fabs(fQy));
++nCount;
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index e77276f1fc35..19ec94e892cf 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -296,7 +296,7 @@ into a hyperlink.
Unfortunately the UNO API for Hyperlink and Ruby consists of the properties
Hyperlink* and Ruby* of the css.text.CharacterProperties service. In other
-words, they are treated as formatting attributes, not as content entites.
+words, they are treated as formatting attributes, not as content entities.
Furthermore, for API users it is not possible to easily test whether a certain
range would be overlapping with other nested attributes, and most importantly,
which ones, so we can hardly refuse to insert these in cases of
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source framework/source include/LibreOfficeKit libreofficekit/source sd/source
filter/source/xslt/import/wordml/wordml2ooo_table.xsl |2 +-
framework/source/fwe/helper/actiontriggerhelper.cxx |2 +-
include/LibreOfficeKit/LibreOfficeKitEnums.h |2 +-
libreofficekit/source/gtk/lokdocview.cxx |2 +-
sd/source/ui/inc/ViewShellImplementation.hxx |2 +-
sd/source/ui/view/outlnvsh.cxx|2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 2eff4b5945144d8ed74c17c0a688d1c50fd0ae33
Author: Andrea Gelmini
Date: Thu Dec 21 09:17:27 2017 +0100
Fix typos
Change-Id: I5c6e252072089a06f0be4292d51aed020cbc67fe
Reviewed-on: https://gerrit.libreoffice.org/46888
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/filter/source/xslt/import/wordml/wordml2ooo_table.xsl
b/filter/source/xslt/import/wordml/wordml2ooo_table.xsl
index 83a9004e4ddd..6948469c4020 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo_table.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo_table.xsl
@@ -176,7 +176,7 @@
-
+
TableFrame
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx
b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 25aa25474593..9e9457ce80f5 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -134,7 +134,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16&
nItemId, const Reference< X
if ( nIndex >= 0 )
{
// Special code for our menu implementation:
some menu items don't have a
-// command url but uses the item id as a
unqiue identifier. These entries
+// command url but uses the item id as a
unique identifier. These entries
// got a special url during conversion from
menu=>actiontriggercontainer.
// Now we have to extract this special url and
set the correct item id!!!
nNewItemId = (sal_uInt16)aCommandURL.copy(
nIndex+aSlotURL.getLength() ).toInt32();
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 46be3f25fea8..b1349b45a1c1 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -563,7 +563,7 @@ typedef enum
* - "invalidate" - the area as described by "rectangle" is invalidated
*Clients must request the new area
* - "cursor_invalidate" - cursor is invalidated. New position is in
"rectangle"
- * - "cursor_visible" - cursor visible status is changed. Status is
availabe
+ * - "cursor_visible" - cursor visible status is changed. Status is
available
*in "visible" field
* - "close" - window is closed
*/
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index f2609149de06..ea9047fb3101 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -3254,7 +3254,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
* - "invalidate" - the area as described by "rectangle" is invalidated
*Clients must request the new area
* - "cursor_invalidate" - cursor is invalidated. New position is in
"rectangle"
- * - "cursor_visible" - cursor visible status is changed. Status is
availabe
+ * - "cursor_visible" - cursor visible status is changed. Status is
available
*in "visible" field
* - "close" - window is closed
*/
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx
b/sd/source/ui/inc/ViewShellImplementation.hxx
index 294d648ad0d4..61c3cd6384af 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -91,7 +91,7 @@ public:
class Deleter;
friend class Deleter;
};
-// The member is not a unqiue_ptr because it takes over its own life time
+// The member is not a unique_ptr because it takes over its own life time
// control.
std::weak_ptr mpUpdateLockForMouse;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index ea3dfe5689f2..76625cb36544 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1497,7 +1497,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet )
if (aESel.nStartPara != aESel.nEndPara ||
aESel.nStartPos != aESel.nEndPos)
// spanned selection, i.e. StyleSheet and/or
-// attribution not necessarily unqiue
+// attribution not necessarily unique
rSet.DisableItem(nWhich);
}
break;
__
[Libreoffice-commits] core.git: oox/source
oox/source/ppt/pptimport.cxx | 18 ++
1 file changed, 18 insertions(+)
New commits:
commit 02ea9bc36ab47d68940da55f5012677dfaf0a8b8
Author: Tamás Zolnai
Date: Thu Dec 21 05:44:04 2017 +0100
tdf#114613: Repair function does not work after opening PPTX file
We need to disable undo handling during file import.
Same is done for other file formats (e.g. PPT, XLSX).
Change-Id: I1969c17b4a25b59b0d216ee847b3664e9c2207ca
Reviewed-on: https://gerrit.libreoffice.org/46882
Reviewed-by: Tamás Zolnai
Tested-by: Tamás Zolnai
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index f8fb72526e06..adab8e4f1b96 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -21,6 +21,8 @@
#include
#include
+#include
+#include
#include
#include
#include
@@ -125,6 +127,19 @@ bool PowerPointImport::importDocument()
file:source/dump/pptxdumper.ini. */
OOX_DUMP_FILE( ::oox::dump::pptx::Dumper );
+uno::Reference< document::XUndoManagerSupplier > xUndoManagerSupplier
(getModel(), UNO_QUERY );
+uno::Reference< util::XLockable > xUndoManager;
+bool bWasUnLocked = true;
+if(xUndoManagerSupplier.is())
+{
+xUndoManager = xUndoManagerSupplier->getUndoManager();
+if(xUndoManager.is())
+{
+bWasUnLocked = !xUndoManager->isLocked();
+xUndoManager->lock();
+}
+}
+
importDocumentProperties();
OUString aFragmentPath = getFragmentPathFromFirstTypeFromOfficeDoc(
"officeDocument" );
@@ -158,6 +173,9 @@ bool PowerPointImport::importDocument()
pBox->Execute();
}
+if(xUndoManager.is() && bWasUnLocked)
+xUndoManager->unlock();
+
return bRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx sc/inc
include/svx/svxids.hrc |1 - sc/inc/sc.hrc |3 --- 2 files changed, 4 deletions(-) New commits: commit 0678d8e315af75ba0c04501e72cdeeb896bae697 Author: Noel Grandin Date: Wed Dec 20 15:56:57 2017 +0200 no need to play define games with SID_DRAW_CHART since it's only being used in sc/ Change-Id: I1efc54c1816dfb6b91b6bc407767a19cf795c168 Reviewed-on: https://gerrit.libreoffice.org/46885 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index c7d0557ee293..a98b1b644ba9 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -291,7 +291,6 @@ class SvxPostItIdItem; #define SID_OBJECT_ALIGN_DOWN ( SID_SVX_START + 136 ) #define SID_INSERT_DIAGRAM_FROM_FILE( SID_SVX_START + 139 ) #define SID_INSERT_DIAGRAM ( SID_SVX_START + 140 ) -#define SID_DRAW_CHART SID_INSERT_DIAGRAM #define SID_INSERT_TABLE( SID_SVX_START + 141 ) #define SID_ATTRIBUTES_AREA ( SID_SVX_START + 142 ) #define SID_ATTRIBUTES_LINE ( SID_SVX_START + 143 ) diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 7d2da96617bd..ee3caa1d7e7c 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -118,9 +118,6 @@ #define SID_SCPRINTOPTIONS (SC_VIEW_START + 68) #define SID_WINDOW_SPLIT(SC_VIEW_START + 69) #define SID_WINDOW_FIX (SC_VIEW_START + 70) -#ifdef SID_DRAW_CHART -#undef SID_DRAW_CHART -#endif #define SID_DRAW_CHART (SC_VIEW_START + 71) #define SID_UPDATETABLINKS (SC_VIEW_START + 72) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source sw/source
sc/inc/unonames.hxx |1
sc/source/ui/unoobj/confuno.cxx | 30 ++-
sw/source/uibase/uno/SwXDocumentSettings.cxx | 18
sw/source/uibase/uno/SwXDocumentSettings.hxx |1
4 files changed, 49 insertions(+), 1 deletion(-)
New commits:
commit 785a8564ebb501e2e623133e214467b947f7e671
Author: Katarina Behrens
Date: Mon Nov 27 13:51:55 2017 +0100
tdf#79077: Load/save PapersizeFromSetup into ODF for sw and sc
Change-Id: I0fc1a771927dc7116768cfbb7f7e31006e41e1c8
Reviewed-on: https://gerrit.libreoffice.org/45332
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 6e104542f7dc..f8bf85968615 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -555,6 +555,7 @@
#define SC_UNO_AUTOCALC "AutoCalculate"
#define SC_UNO_PRINTERNAME "PrinterName"
#define SC_UNO_PRINTERSETUP "PrinterSetup"
+#define SC_UNO_PRINTERPAPER "PrinterPaperFromSetup"
#define SC_UNO_APPLYDOCINF "ApplyUserData"
#define SC_UNO_CHARCOMP "CharacterCompressionType"
#define SC_UNO_ASIANKERN"IsKernAsianPunctuation"
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index d2afa88c659e..6894813441e4 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -70,6 +70,7 @@ static const SfxItemPropertyMapEntry*
lcl_GetConfigPropertyMap()
{OUString(SC_UNO_AUTOCALC), 0, cppu::UnoType::get(),
0, 0},
{OUString(SC_UNO_PRINTERNAME), 0, cppu::UnoType::get(),
0, 0},
{OUString(SC_UNO_PRINTERSETUP), 0,
cppu::UnoType>::get(), 0, 0},
+{OUString(SC_UNO_PRINTERPAPER), 0, cppu::UnoType::get(),
0, 0},
{OUString(SC_UNO_APPLYDOCINF), 0, cppu::UnoType::get(),
0, 0},
{OUString(SC_UNO_FORBIDDEN),0,
cppu::UnoType::get(),
beans::PropertyAttribute::READONLY, 0},
{OUString(SC_UNO_CHARCOMP), 0, cppu::UnoType::get(),
0, 0},
@@ -240,7 +241,28 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
SID_PRINT_SELECTEDSHEET, SID_PRINT_SELECTEDSHEET,
SID_SCPRINTOPTIONS,SID_SCPRINTOPTIONS>{} );
-pDocShell->SetPrinter( SfxPrinter::Create( aStream,
std::move(pSet) ) );
+
+SfxPrinter* pPrinter = pDocShell->GetPrinter();
+bool bPreferPrinterPapersize = false;
+if ( pPrinter )
+bPreferPrinterPapersize =
pPrinter->GetPrinterSettingsPreferred();
+
+VclPtr pTempPrinter = SfxPrinter::Create( aStream,
std::move(pSet) );
+pTempPrinter->SetPrinterSettingsPreferred(
bPreferPrinterPapersize );
+pDocShell->SetPrinter( pTempPrinter );
+}
+}
+}
+else if ( aPropertyName == SC_UNO_PRINTERPAPER )
+{
+bool bPreferPrinterPapersize;
+if( aValue >>= bPreferPrinterPapersize )
+{
+if( pDocShell->GetCreateMode() != SfxObjectCreateMode::EMBEDDED )
+{
+SfxPrinter *pTempPrinter = pDocShell->GetPrinter( true );
+if (pTempPrinter)
+pTempPrinter->SetPrinterSettingsPreferred(
bPreferPrinterPapersize );
}
}
}
@@ -462,6 +484,12 @@ uno::Any SAL_CALL
ScDocumentConfiguration::getPropertyValue( const OUString& aPr
else
aRet <<= uno::Sequence();
}
+else if ( aPropertyName == SC_UNO_PRINTERPAPER)
+{
+SfxPrinter *pTempPrinter = pDocShell->GetPrinter( false );
+aRet <<= pTempPrinter && pTempPrinter->GetPrinterSettingsPreferred();
+
+}
else if ( aPropertyName == SC_UNO_APPLYDOCINF )
aRet <<= pDocShell->IsUseUserData();
else if ( aPropertyName == SC_UNO_FORBIDDEN )
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx
b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index ee86063fea52..d7009cd20b26 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -74,6 +74,7 @@ enum SwDocumentSettingsPropertyHandles
HANDLE_ALIGN_TAB_STOP_POSITION,
HANDLE_PRINTER_NAME,
HANDLE_PRINTER_SETUP,
+HANDLE_PRINTER_PAPER,
HANDLE_IS_KERN_ASIAN_PUNCTUATION,
HANDLE_CHARACTER_COMPRESSION_TYPE,
HANDLE_APPLY_USER_DATA,
@@ -150,6 +151,7 @@ static MasterPropertySetInfo * lcl_createSettingsInfo()
{ OUString("AlignTabStopPosition"),
HANDLE_ALIGN_TAB_STOP_POSITION, cppu::UnoType::get(),
0},
{ OUString("PrinterName"),HANDLE_PRINTER_NAME,
cppu::UnoType::get(), 0},
{ OUString("PrinterSetup"), HANDLE_PRINTER_SETUP,
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0b8c13de81241e23262633543081e8ffbacc46e0 Author: Andras Timar Date: Thu Dec 21 10:15:52 2017 +0100 Updated core Project: translations 27c365ae0c967480ce4a6c37ebe0a953dca7ab9b Updated Slovenian translations Change-Id: I90ef315a56f3ee86f48750fa2165a6f33b0cf001 diff --git a/translations b/translations index 46ad5ef5969e..27c365ae0c96 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 46ad5ef5969eaa0cb76b0c031068b97370e40f0f +Subproject commit 27c365ae0c967480ce4a6c37ebe0a953dca7ab9b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-6-0' - source/sl
source/sl/extras/source/autocorr/emoji.po | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) New commits: commit 27c365ae0c967480ce4a6c37ebe0a953dca7ab9b Author: Andras Timar Date: Thu Dec 21 10:15:52 2017 +0100 Updated Slovenian translations Change-Id: I90ef315a56f3ee86f48750fa2165a6f33b0cf001 diff --git a/source/sl/extras/source/autocorr/emoji.po b/source/sl/extras/source/autocorr/emoji.po index 8145ded722b..077010dad76 100644 --- a/source/sl/extras/source/autocorr/emoji.po +++ b/source/sl/extras/source/autocorr/emoji.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: LibreOffice 6.0\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; "POT-Creation-Date: 2017-12-20 12:06+0100\n" -"PO-Revision-Date: 2017-12-20 15:50+0200\n" +"PO-Revision-Date: 2017-12-21 09:31+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "Language: sl\n" @@ -10797,7 +10797,7 @@ msgctxt "" "SYMBOL_FOR_MARKS_CHAPTER\n" "LngText.text" msgid "marks chapter" -msgstr "bralna oznaka" +msgstr "markovo poglavje" #. ð (U+1F548), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11040,7 +11040,7 @@ msgctxt "" "EMPTY_NOTE_PAGE\n" "LngText.text" msgid "empty note page" -msgstr "prazna notna stran" +msgstr "prazna zabeležka" #. ð (U+1F5CA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11058,7 +11058,7 @@ msgctxt "" "NOTE\n" "LngText.text" msgid "note3" -msgstr "nota3" +msgstr "zabeležka3" #. ð (U+1F5C7), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11121,7 +11121,7 @@ msgctxt "" "EMPTY_NOTE\n" "LngText.text" msgid "empty note" -msgstr "prazno sporoÄilo" +msgstr "prazna zabeležka" #. ð¿ (U+1F5BF), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11355,7 +11355,7 @@ msgctxt "" "PORTABLE_STEREO\n" "LngText.text" msgid "stereo" -msgstr "prenosni stereo sistem" +msgstr "prenosni kasetnik" #. ð¶ (U+1F3F6), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11373,7 +11373,7 @@ msgctxt "" "BLACK_PENNANT\n" "LngText.text" msgid "pennant" -msgstr "prapor" +msgstr "trikotna zastavica" #. ð (U+1F5A0), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11400,7 +11400,7 @@ msgctxt "" "WHITE_PENNANT\n" "LngText.text" msgid "pennant2" -msgstr "prapor2" +msgstr "trikotna zastavica2" #. ð (U+1F544), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11706,7 +11706,7 @@ msgctxt "" "NERD_FACE\n" "LngText.text" msgid "nerd" -msgstr "obsedenec" +msgstr "piflar" #. ð¤ (U+1F916), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11769,7 +11769,7 @@ msgctxt "" "SIGN_OF_THE_HORNS\n" "LngText.text" msgid "horns" -msgstr "hupe" +msgstr "rogovi" #. ð¿ (U+1F4FF), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -11994,7 +11994,7 @@ msgctxt "" "MENORAH_WITH_NINE_BRANCHES\n" "LngText.text" msgid "menorah" -msgstr "tempelj" +msgstr "sveÄnik (menorah)" #. 𤣠(U+1F923), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -12003,7 +12003,7 @@ msgctxt "" "ROLLING_ON_THE_FLOOR_LAUGHING\n" "LngText.text" msgid "lol" -msgstr "rolanje po tleh" +msgstr "lol" #. 𤤠(U+1F924), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -12471,7 +12471,7 @@ msgctxt "" "STUFFED_FLATBREAD\n" "LngText.text" msgid "flatbread" -msgstr "kruh" +msgstr "lepinja" #. ð¥ (U+1F95A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: some information for comparison
Hi, On Wed, Dec 20, 2017 at 07:16:02PM +0100, malervier...@arcor.de wrote: > to get an impression of the progress of your fork to the original cppunit as > well as http://cppunit.sourceforge.net/cppunit2/features.html I am missing a > feature list or a roadmap. Apart from > https://cgit.freedesktop.org/libreoffice/cppunit/tree/TODO and > https://cgit.freedesktop.org/libreoffice/cppunit/log/ I found no compact > survey concerning the (future) development. > Where are these facts located? There is no formal team behind cppunit that would have secret plans, I'm afraid. :-) Perhaps Markus has some plans, but otherwise simply if people have some need, they implement it, it gets into git, and from time to time a release is cut. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/SwUndoPageDesc.cxx | 114 -
1 file changed, 114 deletions(-)
New commits:
commit bf8e8cf11bc0d60ab80f5b3420dc424aec2fa626
Author: Miklos Vajna
Date: Wed Dec 20 21:32:07 2017 +0100
sw: remove DebugHeaderFooterContent() in SwUndoPageDesc
No longer builds, and the plain node array output in gdb / doc model xml
dump is comparable functionality.
Change-Id: Ia51dc8c707b4827aa54b9d27f3b66e5e6539a530
Reviewed-on: https://gerrit.libreoffice.org/46862
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx
b/sw/source/core/undo/SwUndoPageDesc.cxx
index 10602da49624..0178cd0ff5bd 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -28,73 +28,6 @@
#include
#include
-#if OSL_DEBUG_LEVEL > 1
-#include
-#endif
-
-#if OSL_DEBUG_LEVEL > 1
-// Pure debug help function to have a quick look at the header/footer
attributes.
-void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
-{
-sal_uLong nHeaderMaster = ULONG_MAX;
-sal_uLong nHeaderLeft = ULONG_MAX;
-sal_uLong nFooterMaster = ULONG_MAX;
-sal_uLong nFooterLeft = ULONG_MAX;
-
-SwFormatHeader& rHead = (SwFormatHeader&)rPageDesc.GetMaster().GetHeader();
-SwFormatFooter& rFoot = (SwFormatFooter&)rPageDesc.GetMaster().GetFooter();
-SwFormatHeader& rLeftHead =
(SwFormatHeader&)rPageDesc.GetLeft().GetHeader();
-SwFormatFooter& rLeftFoot =
(SwFormatFooter&)rPageDesc.GetLeft().GetFooter();
-if( rHead.IsActive() )
-{
-SwFrameFormat* pHeaderFormat = rHead.GetHeaderFormat();
-if( pHeaderFormat )
-{
-const SwFormatContent* pContent = &pHeaderFormat->GetContent();
-if( pContent->GetContentIdx() )
-nHeaderMaster = pContent->GetContentIdx()->GetIndex();
-else
-nHeaderMaster = 0;
-}
-SwFrameFormat* pLeftHeaderFormat = rLeftHead.GetHeaderFormat();
-if( pLeftHeaderFormat )
-{
-const SwFormatContent* pLeftContent =
&pLeftHeaderFormat->GetContent();
-if( pLeftContent->GetContentIdx() )
-nHeaderLeft = pLeftContent->GetContentIdx()->GetIndex();
-else
-nHeaderLeft = 0;
-}
-}
-if( rFoot.IsActive() )
-{
-SwFrameFormat* pFooterFormat = rFoot.GetFooterFormat();
-if( pFooterFormat )
-{
-const SwFormatContent* pContent = &pFooterFormat->GetContent();
-if( pContent->GetContentIdx() )
-nFooterMaster = pContent->GetContentIdx()->GetIndex();
-else
-nFooterMaster = 0;
-}
-SwFrameFormat* pLeftFooterFormat = rLeftFoot.GetFooterFormat();
-if( pLeftFooterFormat )
-{
-const SwFormatContent* pLeftContent =
&pLeftFooterFormat->GetContent();
-if( pLeftContent->GetContentIdx() )
-nFooterLeft = pLeftContent->GetContentIdx()->GetIndex();
-else
-nFooterLeft = 0;
-}
-}
-
-(void)nHeaderMaster;
-(void)nHeaderLeft;
-(void)nFooterMaster;
-(void)nFooterLeft;
-}
-#endif
-
SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
const SwPageDesc & _aNew,
SwDoc * _pDoc)
@@ -106,11 +39,6 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
{
OSL_ENSURE(nullptr != pDoc, "no document?");
-#if OSL_DEBUG_LEVEL > 1
-DebugHeaderFooterContent( aOld.m_PageDesc );
-DebugHeaderFooterContent( aNew.m_PageDesc );
-#endif
-
/*
The page description changes.
If there are no header/footer content changes like header on/off or change
from shared content
@@ -189,10 +117,6 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
// After this exchange method the old page description will point to
zero,
// the new one will point to the node position of the original content
nodes.
ExchangeContentNodes( aOld.m_PageDesc, aNew.m_PageDesc );
-#if OSL_DEBUG_LEVEL > 1
-DebugHeaderFooterContent( aOld.m_PageDesc );
-DebugHeaderFooterContent( aNew.m_PageDesc );
-#endif
}
}
@@ -213,12 +137,6 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc&
rSource, SwPageDesc &rDes
rDest.GetMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem
);
SfxPoolItem *pNewItem = pItem->Clone();
SwFrameFormat* pNewFormat =
static_cast(pNewItem)->GetHeaderFormat();
-#if OSL_DEBUG_LEVEL > 1
-const SwFormatContent& rSourceContent =
rSourceHead.GetHeaderFormat()->GetContent();
-(void)rSourceContent;
-const SwFormatContent& rDestContent =
rDestHead.GetHeaderFormat()->GetContent();
-(void)rDestContent;
-#endif
pNewFormat->SetFormatAttr( rSourceHead.GetHeaderFormat()->GetContent()
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/salusereventlist.hxx|8 ---
vcl/source/app/salusereventlist.cxx | 41 +++-
2 files changed, 32 insertions(+), 17 deletions(-)
New commits:
commit 5469ac13b13e458904900539e6542d4a83d44c4e
Author: Jan-Marek Glogowski
Date: Fri Dec 15 13:39:32 2017 +0100
Prevent out-of-order LO event processing
There's a callback processing loop, introduced by
a7c84375db517769035080c8fed33b2f303fc42f, which releases the
SolarMutex and is triggered by a queued user event. Such a
scenario can easily be reproduced by any LOK client resulting in
hitting the empty user event processing list assertion.
I'm not sure this should be handled via LO events at all.
So this - again - gets rid of the the assertion and tries to
prevent processing the user events out-of-order.
In the case of giving up the SolarMutex while processing a user
event an other thread or even nested loop can "steal" the user
event list and continue processing.
Most VCL backends run the event loop just in the main process,
so for them this scenario is guaranteed. But the headless
backend - running without UI or from LOK - is still allowed to
process events in any thread. This is harder to fix and probably
should use the same solution the gtk* backends use.
This also changes the dequeues into lists to use splice for
appending them.
Change-Id: Id4a93a01dea415271ad96098830f18f06d4a75b9
Reviewed-on: https://gerrit.libreoffice.org/46550
Tested-by: Jenkins
Reviewed-by: Henry Castro
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/vcl/inc/salusereventlist.hxx b/vcl/inc/salusereventlist.hxx
index 123b9dadd1c7..52a195a68f82 100644
--- a/vcl/inc/salusereventlist.hxx
+++ b/vcl/inc/salusereventlist.hxx
@@ -23,10 +23,11 @@
#include
#include
#include
+#include
#include
-#include
+#include
#include
class SalFrame;
@@ -65,10 +66,11 @@ public:
protected:
mutable osl::Mutex m_aUserEventsMutex;
-std::deque< SalUserEvent > m_aUserEvents;
-std::deque< SalUserEvent > m_aProcessingUserEvents;
+std::list< SalUserEvent > m_aUserEvents;
+std::list< SalUserEvent > m_aProcessingUserEvents;
bool m_bAllUserEventProcessedSignaled;
SalFrameSetm_aFrames;
+oslThreadIdentifierm_aProcessingThread;
virtual void ProcessEvent( SalUserEvent aEvent ) = 0;
virtual void TriggerUserEventProcessing() = 0;
diff --git a/vcl/source/app/salusereventlist.cxx
b/vcl/source/app/salusereventlist.cxx
index 50ef1f892002..bd58a508464f 100644
--- a/vcl/source/app/salusereventlist.cxx
+++ b/vcl/source/app/salusereventlist.cxx
@@ -33,6 +33,7 @@
SalUserEventList::SalUserEventList()
: m_bAllUserEventProcessedSignaled( true )
+, m_aProcessingThread(0)
{
}
@@ -57,30 +58,40 @@ void SalUserEventList::eraseFrame( SalFrame* pFrame )
bool SalUserEventList::DispatchUserEvents( bool bHandleAllCurrentEvents )
{
bool bWasEvent = false;
+oslThreadIdentifier aCurId = osl::Thread::getCurrentIdentifier();
+DBG_TESTSOLARMUTEX();
+// cleared after we pop a single event and are save in the 2nd guard.
+// this way we guarantee to process at least one event, if available.
+osl::ResettableMutexGuard aResettableGuard(m_aUserEventsMutex);
+
+if (!m_aUserEvents.empty())
{
-osl::MutexGuard aGuard( m_aUserEventsMutex );
-assert( m_aProcessingUserEvents.empty() );
-if( ! m_aUserEvents.empty() )
+if (bHandleAllCurrentEvents)
{
-if( bHandleAllCurrentEvents )
-m_aProcessingUserEvents.swap( m_aUserEvents );
+if (m_aProcessingUserEvents.empty())
+m_aProcessingUserEvents.swap(m_aUserEvents);
else
-{
-m_aProcessingUserEvents.push_back( m_aUserEvents.front() );
-m_aUserEvents.pop_front();
-}
-bWasEvent = true;
+m_aProcessingUserEvents.splice(m_aProcessingUserEvents.end(),
m_aUserEvents);
+}
+else if (m_aProcessingUserEvents.empty())
+{
+m_aProcessingUserEvents.push_back( m_aUserEvents.front() );
+m_aUserEvents.pop_front();
}
}
-if( bWasEvent )
+if (HasUserEvents())
{
+bWasEvent = true;
+m_aProcessingThread = aCurId;
+
SalUserEvent aEvent( nullptr, nullptr, SalEvent::NONE );
do {
{
-osl::MutexGuard aGuard( m_aUserEventsMutex );
-if ( m_aProcessingUserEvents.empty() )
+osl::MutexGuard aGuard(m_aUserEventsMutex);
+aResettableGuard.clear();
+if (m_aProcessingUserEvents.empty() || aCurId !=
m_aProcessingThread)
break;
aEvent = m_aProcessingUserEvents.front();
