[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarController.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit b25284244a4a0e5ff480538133ee18f471a4bfc8
Author: Samuel Mehrbrodt
AuthorDate: Tue Jul 30 11:18:45 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Wed Jul 31 07:12:13 2019 +0200
tdf#126508 Fix crash when changing icon style
Regression from b58aa94f1f365c746135470bceb97cc182c289bc
Change-Id: I253447c197d8b333e26f243e26794e775f3edcee
Reviewed-on: https://gerrit.libreoffice.org/76589
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 4dd30f0b1a71..f2f532ff12b2 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -729,6 +729,8 @@ void SidebarController::SwitchToDeck (
const DeckDescriptor& rDeckDescriptor,
const Context& rContext)
{
+maFocusManager.Clear();
+
const bool bForceNewDeck
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
const bool bForceNewPanels
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
mnRequestedForceFlags = SwitchFlag_NoForce;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/source
sc/source/core/data/table2.cxx |2 +-
sc/source/ui/unoobj/fmtuno.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dec9dec4d2a51612c301019f4becd41227b56df4
Author: Aron Budea
AuthorDate: Sun Jul 28 05:51:40 2019 +0200
Commit: Aron Budea
CommitDate: Wed Jul 31 04:26:29 2019 +0200
tdf#125800: accessing cond format props in UNO throws error
These conditions were always evaluated to true: OR should
become AND when negated.
Regression from 8c637b47d9de4b3a64c33a9c2ffe7ed220be2467
Change-Id: I87038319ed27eff2bed2412da49e01f73ec0a79c
Reviewed-on: https://gerrit.libreoffice.org/76493
Reviewed-by: Gülşah Köse
Reviewed-by: Aron Budea
Tested-by: Aron Budea
(cherry picked from commit 9ad8f83912e6cf14d7b3b3e1cb2a79d819247c82)
Reviewed-on: https://gerrit.libreoffice.org/76705
Tested-by: Jenkins CollaboraOffice
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 632f53d43d99..d5217874a7c3 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2160,7 +2160,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE
nArrCount, SCCOL nX1, SCC
for (size_t nEntry=0; nEntryGetEntry(nEntry);
-if(pEntry->GetType() !=
ScFormatEntry::Type::Condition ||
+if(pEntry->GetType() !=
ScFormatEntry::Type::Condition &&
pEntry->GetType() !=
ScFormatEntry::Type::ExtCondition)
continue;
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 22dda7d06faf..84354f2b404f 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -159,7 +159,7 @@ ScTableConditionalFormat::ScTableConditionalFormat(
{
ScCondFormatEntryItem aItem;
const ScFormatEntry* pFrmtEntry = pFormat->GetEntry(i);
-if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition
||
+if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition
&&
pFrmtEntry->GetType() !=
ScFormatEntry::Type::ExtCondition)
continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-0' - sw/source
sw/source/core/doc/docedt.cxx|3 ++-
sw/source/core/txtnode/ndtxt.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d929e17d4274e569bf2453a3263c76691a89acb9
Author: Michael Stahl
AuthorDate: Mon Jul 22 19:27:11 2019 +0200
Commit: Thorsten Behrens
CommitDate: Wed Jul 31 03:55:43 2019 +0200
tdf#126340 sw_redlinehide: only move merged frames in JoinPrev
The problem was that the first and second node were not actually merged
by a redline, so moving the frames doesn't make sense.
(regression from 41d8ca9686c7c184f586e99674b443c34bfd4f33)
Change-Id: Ib401e4b0b2b207666f65c038ab5c346807bfea92
Reviewed-on: https://gerrit.libreoffice.org/76125
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 91b344b0346347ac40d2d6fa03a03e92d2e9f252)
Reviewed-on: https://gerrit.libreoffice.org/76149
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 680c4eac7a39b7e039d7828a3cac839395b9a36e)
Reviewed-on: https://gerrit.libreoffice.org/76533
Reviewed-by: Christian Lohmaier
Reviewed-by: Xisco Faulí
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index baf32805d516..791736f41a04 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -414,7 +414,8 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev )
}
// delete the Node, at last!
SwNode::Merge const
eOldMergeFlag(pOldTextNd->GetRedlineMergeFlag());
-if (eOldMergeFlag == SwNode::Merge::First)
+if (eOldMergeFlag == SwNode::Merge::First
+&& !pTextNd->IsCreateFrameWhenHidingRedlines())
{
sw::MoveDeletedPrevFrames(*pOldTextNd, *pTextNd);
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 691c20f6490b..cced7186d49e 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1126,7 +1126,8 @@ void SwTextNode::JoinPrev()
pDoc->CorrAbs( aIdx, SwPosition( *this ), nLen, true );
}
SwNode::Merge const eOldMergeFlag(pTextNode->GetRedlineMergeFlag());
-if (eOldMergeFlag == SwNode::Merge::First)
+if (eOldMergeFlag == SwNode::Merge::First
+&& !IsCreateFrameWhenHidingRedlines())
{
sw::MoveDeletedPrevFrames(*pTextNode, *this);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/datasource.cxx | 16 +++-
dbaccess/source/ui/dlg/dbwizsetup.cxx |1 +
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 77ef0a92b3bd19f836d0fcb2a41af5e643129283
Author: Xisco Fauli
AuthorDate: Mon Jul 15 17:52:23 2019 +0200
Commit: Thorsten Behrens
CommitDate: Wed Jul 31 03:49:17 2019 +0200
tdf#121599, tdf#123099: ignore migration dialog when
1. a new HSQLDB database is created
2. the HSQLDB database is not opened interactively
Change-Id: I7287e467e06be5eec1e5c661123e1332cdaeef9b
Reviewed-on: https://gerrit.libreoffice.org/75643
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index c3b6214e7bc8..d2afd8cc78aa 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -602,8 +602,22 @@ Reference< XConnection >
ODatabaseSource::buildLowLevelConnection(const OUString
Reference< XDriverManager > xManager;
#if ENABLE_FIREBIRD_SDBC
+bool bIgnoreMigration = false;
bool bNeedMigration = false;
-if(m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb")
+Reference< XModel > xModel = m_pImpl->getModel_noCreate();
+if ( xModel)
+{
+//See ODbTypeWizDialogSetup::SaveDatabaseDocument
+::comphelper::NamedValueCollection aArgs( xModel->getArgs() );
+aArgs.get("IgnoreFirebirdMigration") >>= bIgnoreMigration;
+}
+else
+{
+//ignore when we don't have a model. E.g. Mailmerge, data sources,
fields...
+bIgnoreMigration = true;
+}
+
+if(!bIgnoreMigration && m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb")
{
Reference const xRootStorage =
m_pImpl->getOrCreateRootStorage();
OUString sMigrEnvVal;
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 5076997c30ed..76405e537cfe 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -681,6 +681,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
aArgs.put( "Overwrite", true );
aArgs.put( "InteractionHandler", xHandler );
aArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG );
+aArgs.put( "IgnoreFirebirdMigration", true );
OUString sPath =
ODbDataSourceAdministrationHelper::getDocumentUrl( *m_pOutSet );
xStore->storeAsURL( sPath, aArgs.getPropertyValues() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 54028dc503fc08eb12e287919d5e2850cff05b73
Author: Xisco Fauli
AuthorDate: Tue Jul 16 15:34:53 2019 +0200
Commit: Thorsten Behrens
CommitDate: Wed Jul 31 03:46:51 2019 +0200
tdf#123591: truncate and round to 'scale' number of decimal places
otherwise the number will be incorrectly converted to OUString
if scale < number of decimals
See https://bugs.documentfoundation.org/show_bug.cgi?id=123591#c25
Change-Id: Ie32c9c6ab339d6907e9a4e2645d6f19bad9e67c8
Reviewed-on: https://gerrit.libreoffice.org/75727
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 69ce91f42da1..71a43454f315 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
@@ -729,7 +730,8 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(
sal_Int32 parameterIndex, c
OUString sValue;
if( x >>= dbValue )
{
-sValue = OUString::number( dbValue );
+// truncate and round to 'scale' number of decimal places
+sValue = OUString::number( std::floor((dbValue *
pow10Integer(scale)) + .5) / pow10Integer(scale) );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/tests registry/source
qadevOOo/tests/java/ifc/text/_XTextContent.java |2 +-
qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java|4 ++--
qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java |2 +-
qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java |2 +-
qadevOOo/tests/java/ifc/util/_XStringSubstitution.java |4 ++--
qadevOOo/tests/java/ifc/view/_XScreenCursor.java|2 +-
qadevOOo/tests/java/mod/_defreg/NestedRegistry.java |4 ++--
qadevOOo/tests/java/mod/_fwk/JobExecutor.java |2 +-
qadevOOo/tests/java/mod/_fwk/JobHandler.java|2 +-
qadevOOo/tests/java/mod/_fwk/ModuleManager.java |2 +-
qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java |4 ++--
qadevOOo/tests/java/mod/_sc/ScTabViewObj.java |6 +++---
qadevOOo/tests/java/mod/_sch/ChXDiagram.java|2 +-
registry/source/keyimpl.cxx |2 +-
14 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit ca6df519a78e5bfc96030c916f242b86306194e5
Author: Andrea Gelmini
AuthorDate: Tue Jul 30 08:03:32 2019 +0200
Commit: Andrea Gelmini
CommitDate: Tue Jul 30 23:47:47 2019 +0200
Fix typos
Change-Id: Ia5fba032635adbf85bdfcb1eb0b3ffb9cf9d4a6a
Reviewed-on: https://gerrit.libreoffice.org/76548
Reviewed-by: Julien Nabet
Tested-by: Andrea Gelmini
diff --git a/qadevOOo/tests/java/ifc/text/_XTextContent.java
b/qadevOOo/tests/java/ifc/text/_XTextContent.java
index 3b6a5e0a4578..bcb65b806343 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextContent.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextContent.java
@@ -52,7 +52,7 @@ public class _XTextContent extends MultiMethodTest {
/**
* Tries to get the anchor of the text content
* an XTextRange is returned.
- * The test is OK if an not null text range is returned
+ * The test is OK if a not null text range is returned
*/
public void _getAnchor() {
log.println("getAnchor()");
diff --git a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
index 4dedd74cf6d9..47d389c9a4af 100644
--- a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
+++ b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java
@@ -67,7 +67,7 @@ public class _XTextRangeCompare extends MultiMethodTest {
/**
* Retrieves XText interface from relation 'TEXTDOC'
* or from 'TEXT'.
- * @throws StatusException If neither 'TEXTDOC' nore 'TEXT'
+ * @throws StatusException If neither 'TEXTDOC' nor 'TEXT'
* relation exists.
*/
@Override
@@ -87,7 +87,7 @@ public class _XTextRangeCompare extends MultiMethodTest {
if (oText == null) {
throw new StatusException(Status.failed
-("Neither 'TEXTDOC' nore 'TEXT' relation not found")) ;
+("Neither 'TEXTDOC' nor 'TEXT' relation not found")) ;
}
}
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
index d129579e1ff4..6a66dae9ee63 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
@@ -43,7 +43,7 @@ public class _XContentIdentifierFactory extends
MultiMethodTest {
/**
* Calls the tested method with a file url and
* gets an identifier.
- * Has OK status if content identifier an provider sheme are
+ * Has OK status if content identifier and provider scheme are
* proper.
*/
public void _createContentIdentifier() {
diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java
b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java
index 8b880e67cf7c..73290288c89c 100644
--- a/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java
+++ b/qadevOOo/tests/java/ifc/ui/_XUIConfiguration.java
@@ -63,7 +63,7 @@ public class _XUIConfiguration extends MultiMethodTest {
}
/**
- * adds a listener an fire an event
+ * adds a listener and fires an event
* Has OK status if listener was called
*/
public void _addConfigurationListener() {
diff --git a/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java
b/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java
index a19ecbaf467c..77d5fe5fbb43 100644
--- a/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java
+++ b/qadevOOo/tests/java/ifc/util/_XStringSubstitution.java
@@ -37,7 +37,7 @@ public class _XStringSubstitution extends MultiMethodTest {
tRes.tested("getSubstituteVariableValue()",false);
}
try {
-log.println("try to get a invalid variable...");
+log.println("try to get an invalid variable...");
String toCheck = "$(ThisVariableShouldNoExist)";
oObj.getSubstituteVariableValue(toCheck);
log.println("$
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 682be3766c50a648883cd4c7cd4e24cdab29a075 Author: Andrea Gelmini AuthorDate: Tue Jul 30 18:53:54 2019 +0200 Commit: Andrea Gelmini CommitDate: Tue Jul 30 23:47:18 2019 +0200 Removed duplicated include Change-Id: I2b1b7bb2cd88be4be518d045d54a0f0ee8583b8b Reviewed-on: https://gerrit.libreoffice.org/76713 Reviewed-by: Julien Nabet Tested-by: Andrea Gelmini diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 5b7de9ae81e3..a827c87d8d4b 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner qadevOOo/tests testtools/source
qadevOOo/runner/helper/APIDescGetter.java |2 +-
qadevOOo/tests/java/mod/_connector/uno/package.html |2 +-
qadevOOo/tests/java/mod/_connectr/package.html |2 +-
testtools/source/performance/ubtest.cxx |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 7166b64c9ac101a0dc1363c31f892095a2097cbe
Author: Andrea Gelmini
AuthorDate: Tue Jul 30 07:43:51 2019 +0200
Commit: Julien Nabet
CommitDate: Tue Jul 30 23:04:38 2019 +0200
Fix typo in code
"connectr"
Please look at:
https://gerrit.libreoffice.org/#/c/76543/1
Change-Id: I3862780f92b8ce4583d642e3f653389a4ef3cc22
Reviewed-on: https://gerrit.libreoffice.org/76575
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/qadevOOo/runner/helper/APIDescGetter.java
b/qadevOOo/runner/helper/APIDescGetter.java
index 25a2db220357..65f8da05c99d 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -942,7 +942,7 @@ public class APIDescGetter extends DescGetter
ArrayList removed = new ArrayList();
removed.add("acceptor");
removed.add("brdgfctr");
-removed.add("connectr");
+removed.add("connector");
removed.add("corefl");
removed.add("cpld");
removed.add("defreg");
diff --git a/qadevOOo/tests/java/mod/_connector/uno/package.html
b/qadevOOo/tests/java/mod/_connector/uno/package.html
index e4d67d4bdd8c..c9ff7b2b5596 100644
--- a/qadevOOo/tests/java/mod/_connector/uno/package.html
+++ b/qadevOOo/tests/java/mod/_connector/uno/package.html
@@ -18,6 +18,6 @@
-->
-Contains all test cases for the module 'connectr'.
+Contains all test cases for the module 'connector'.
diff --git a/qadevOOo/tests/java/mod/_connectr/package.html
b/qadevOOo/tests/java/mod/_connectr/package.html
index e4d67d4bdd8c..c9ff7b2b5596 100644
--- a/qadevOOo/tests/java/mod/_connectr/package.html
+++ b/qadevOOo/tests/java/mod/_connectr/package.html
@@ -18,6 +18,6 @@
-->
-Contains all test cases for the module 'connectr'.
+Contains all test cases for the module 'connector'.
diff --git a/testtools/source/performance/ubtest.cxx
b/testtools/source/performance/ubtest.cxx
index cc17f097d1b8..283e73d699c9 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -342,7 +342,7 @@ static void createInstance( Reference< T > & rxOut,
xMgr, Reference< XRegistryKey >() ) ) );
// connector
xSet->insert( makeAny( loadLibComponentFactory(
-OUString("connectr"),
+OUString("connector"),
OUString("com.sun.star.comp.stoc.Connector"),
xMgr, Reference< XRegistryKey >() ) ) );
// iiop bridge
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang cui/source include/svx solenv/clang-format svx/Library_svxcore.mk svx/source sw/source
compilerplugins/clang/constantparam.booleans.results |8
compilerplugins/clang/overrideparam.cxx |4
cui/source/options/optfltr.cxx | 22 +-
include/svx/checklbx.hxx | 68
solenv/clang-format/blacklist|4
svx/Library_svxcore.mk |1
svx/source/dialog/checklbx.cxx | 161 ---
sw/source/uibase/inc/optcomp.hxx |1
sw/source/uibase/inc/optload.hxx |1
9 files changed, 13 insertions(+), 257 deletions(-)
New commits:
commit ee0613bd9ed3a9539f1ebb58b51962c9ccd13376
Author: Caolán McNamara
AuthorDate: Tue Jul 30 16:43:44 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 21:14:29 2019 +0200
bFirst means 1st vs 2nd column, and needs to alternate on each loop
this went wrong at...
commit f423ac2d3bdba4263f1f41e31e7e2b7715afdd6e
Date: Tue Mar 5 15:16:16 2019 +0200
remove sal_IntPtr in OfaMSFilterTabPage2
and just use a scoped enum
Change-Id: I74bcca9ffee9faf4600da64b3c409dbf19a1290e
Reviewed-on: https://gerrit.libreoffice.org/76619
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index d11c655a472f..54d7e5817fe2 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -210,12 +210,14 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
&SvtFilterOptions::SetSmartArt2Shape },
};
-bool bCheck, bFirst = true;
+bool bFirstCol = true;
for( const ChkCBoxEntries & rEntry : aChkArr )
{
-sal_uInt16 nCol = bFirst ? 1 : 2;
-if (bFirst)
-bFirst = false;
+// we loop through the list, alternating reading the first/second
column,
+// each row appears twice in the list (except for smartart, which is
import
+// only
+sal_uInt16 nCol = bFirstCol ? 1 : 2;
+bFirstCol = !bFirstCol;
SvTreeListEntry* pEntry = GetEntry4Type( rEntry.eType );
if( pEntry )
{
@@ -223,7 +225,7 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
if (rItem.GetType() == SvLBoxItemType::Button)
{
SvItemStateFlags nButtonFlags = rItem.GetButtonFlags();
-bCheck = SvButtonState::Checked ==
+bool bCheck = SvButtonState::Checked ==
SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
if( bCheck != (rOpt.*rEntry.FnIs)() )
@@ -283,12 +285,14 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
{ MSFltrPg2_CheckBoxEntries::SmartArt,
&SvtFilterOptions::IsSmartArt2Shape },
};
-bool bFirst = true;
+bool bFirstCol = true;
for( const ChkCBoxEntries & rArr : aChkArr )
{
-sal_uInt16 nCol = bFirst ? 1 : 2;
-if (bFirst)
-bFirst = false;
+// we loop through the list, alternating reading the first/second
column,
+// each row appears twice in the list (except for smartart, which is
import
+// only
+sal_uInt16 nCol = bFirstCol ? 1 : 2;
+bFirstCol = !bFirstCol;
SvTreeListEntry* pEntry = GetEntry4Type( rArr.eType );
if( pEntry )
{
commit 588f50ac41666e73a7c73c13e677a9927bad991f
Author: Caolán McNamara
AuthorDate: Tue Jul 30 16:05:55 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 21:14:11 2019 +0200
remove newly unused SvxCheckListBox
Change-Id: I6a5f4dfea9fbb34f02c1752140e04d1d0a8a67a7
Reviewed-on: https://gerrit.libreoffice.org/76617
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/compilerplugins/clang/constantparam.booleans.results
b/compilerplugins/clang/constantparam.booleans.results
index 39637cd6b887..a39ccbc292a8 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -254,10 +254,6 @@ cui/source/inc/hangulhanjadlg.hxx:60
class rtl::OUString svx::SuggestionDisplay::GetEntry(unsigned short) const
unsigned short nPos
0
-cui/source/inc/radiobtnbox.hxx:40
-void svx::SvxRadioButtonListBox::SvxRadioButtonListBox(class
SvSimpleTableContainer &,long)
-long nBits
-0
cui/source/inc/scriptdlg.hxx:122
void SvxScriptOrgDialog::insertEntry(const class rtl::OUString &,const
class rtl::OUString &,const class weld::TreeIter *,_Bool,class
std::unique_ptr >
&&,const class rtl::OUString &,_Bool)
_Bool bChildrenOnDemand
@@ -1114,10 +1110,6 @@ include/svx/algitem.hxx:39
void SvxOrientationItem::SvxOrientationItem(int,_Bool,const unsigned short)
const unsigned short nId
0
-include/svx/checklbx.hxx:55
-void SvxCheckLis
[Libreoffice-commits] core.git: extras/source solenv/bin svx/source sw/source sw/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |3
solenv/bin/native-code.py |1
svx/source/dialog/checklbx.cxx |2
sw/source/ui/config/optcomp.cxx| 144 ---
sw/source/uibase/inc/optcomp.hxx | 24 +--
sw/uiconfig/swriter/ui/optcompatpage.ui| 152 -
6 files changed, 188 insertions(+), 138 deletions(-)
New commits:
commit 37c01754ae0a9daaa2f37bd9c1cc9f3b3a84ce21
Author: Caolán McNamara
AuthorDate: Tue Jul 30 16:03:10 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 21:13:56 2019 +0200
weld SwCompatibilityOptPage
Change-Id: Id66751642a631d033385c3da9ba5cd484ba9dcf6
Reviewed-on: https://gerrit.libreoffice.org/76616
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 1c69d1c76388..4ada0543e8ad 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -150,9 +150,6 @@
-
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9679d3d26d01..d6d90b3caac1 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -498,7 +498,6 @@ custom_widgets = [
'SvtURLBox',
'Svx3DPreviewControl',
'SvxCharViewControl',
-'SvxCheckListBox',
'SvxColorListBox',
'SvxColorValueSet',
'SvxFillAttrBox',
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 3f3c5581280e..1a9c63ad1134 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -31,8 +31,6 @@ SvxCheckListBox::SvxCheckListBox( vcl::Window* pParent,
WinBits nWinStyle ) :
Init_Impl();
}
-VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxCheckListBox, WB_TABSTOP)
-
SvxCheckListBox::~SvxCheckListBox()
{
disposeOnce();
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index c400441c6b08..b527bf6a989f 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -52,97 +52,65 @@ struct SwCompatibilityOptPage_Impl
std::vector< SvtCompatibilityEntry > m_aList;
};
-SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const
SfxItemSet& rSet)
-: SfxTabPage(pParent, "OptCompatPage",
"modules/swriter/ui/optcompatpage.ui", &rSet)
+SwCompatibilityOptPage::SwCompatibilityOptPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "modules/swriter/ui/optcompatpage.ui",
"OptCompatPage", &rSet)
, m_pWrtShell(nullptr)
, m_pImpl(new SwCompatibilityOptPage_Impl)
, m_nSavedOptions(0)
, m_bSavedMSFormsMenuOption(false)
+, m_xMain(m_xBuilder->weld_frame("compatframe"))
+, m_xGlobalOptionsFrame(m_xBuilder->weld_frame("globalcompatframe"))
+, m_xFormattingLB(m_xBuilder->weld_combo_box("format"))
+, m_xGlobalOptionsLB(m_xBuilder->weld_combo_box("globaloptions"))
+, m_xOptionsLB(m_xBuilder->weld_tree_view("options"))
+, m_xGlobalOptionsCLB(m_xBuilder->weld_tree_view("globaloptioncheckbox"))
+, m_xDefaultPB(m_xBuilder->weld_button("default"))
{
-get(m_pMain, "compatframe");
-get(m_pGlobalOptionsFrame, "globalcompatframe");
-get(m_pFormattingLB, "format");
-get(m_pGlobalOptionsLB, "globaloptions");
-get(m_pOptionsLB, "options");
-get(m_pGlobalOptionsCLB, "globaloptioncheckbox");
-get(m_pDefaultPB, "default");
+std::vector aWidths;
+aWidths.push_back(m_xOptionsLB->get_checkbox_column_width());
+m_xOptionsLB->set_column_fixed_widths(aWidths);
+m_xGlobalOptionsCLB->set_column_fixed_widths(aWidths);
+int nPos = 0;
for ( int i = static_cast(SvtCompatibilityEntry::Index::Module) + 1;
i < static_cast(SvtCompatibilityEntry::Index::INVALID); ++i )
{
int nCoptIdx = i - 2; /* Do not consider "Name" & "Module" indexes */
-const OUString sEntry = m_pFormattingLB->GetEntry( nCoptIdx );
-SvTreeListEntry* pEntry = m_pOptionsLB->SvTreeListBox::InsertEntry(
sEntry );
-if ( pEntry )
-{
-m_pOptionsLB->SetCheckButtonState( pEntry,
SvButtonState::Unchecked );
-}
+const OUString sEntry = m_xFormattingLB->get_text(nCoptIdx);
+m_xOptionsLB->append();
+m_xOptionsLB->set_toggle(nPos, TRISTATE_FALSE, 0);
+m_xOptionsLB->set_text(nPos, sEntry, 1);
+++nPos;
}
-m_sUserEntry =
m_pFormattingLB->GetEntry(m_pFormattingLB->GetEntryCount()-1);
-
-m_pFormattingLB->Clear();
-
-m_pOptionsLB->SetStyle( m_pOptionsLB->GetStyle() | WB_HSCROLL |
WB_HIDESELECTION );
-m_pOptionsLB->SetHighlightRange();
+m_sUserEntry = m_xFormattingLB->get_text(m_xFormattingLB->get_count() - 1);
+m_xFormattingLB->clear();
// Set MSOCompatibleFormsMenu entry attributes
const bool bReadOnly =
of
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/IconThemeScanner.cxx|4 ++--
vcl/source/app/i18nhelp.cxx|2 +-
vcl/source/app/salvtables.cxx |2 +-
vcl/source/control/field.cxx |2 +-
vcl/source/control/field2.cxx |4 ++--
vcl/source/control/fmtfield.cxx|2 +-
vcl/source/control/imp_listbox.cxx |2 +-
vcl/source/filter/igif/gifread.cxx |2 +-
vcl/source/filter/ipdf/pdfdocument.cxx |2 +-
vcl/source/filter/png/pngread.cxx |2 +-
vcl/source/font/PhysicalFontCollection.cxx |2 +-
vcl/source/fontsubset/sft.cxx |6 +++---
vcl/source/gdi/bitmap3.cxx |2 +-
vcl/source/gdi/gdimetafiletools.cxx|2 +-
vcl/source/gdi/pdfextoutdevdata.cxx|2 +-
vcl/source/gdi/pdfwriter_impl.hxx |2 +-
vcl/source/gdi/print.cxx |2 +-
vcl/source/gdi/salgdilayout.cxx|2 +-
vcl/source/gdi/scrptrun.cxx|4 ++--
vcl/source/outdev/font.cxx |2 +-
vcl/source/outdev/text.cxx |2 +-
vcl/source/treelist/imap.cxx |2 +-
vcl/source/treelist/svtabbx.cxx|4 ++--
vcl/source/window/accessibility.cxx|2 +-
vcl/source/window/builder.cxx |2 +-
vcl/source/window/menu.cxx |2 +-
vcl/source/window/split.cxx|2 +-
vcl/source/window/splitwin.cxx |2 +-
vcl/source/window/stacking.cxx |4 ++--
vcl/source/window/toolbox.cxx |2 +-
vcl/source/window/window.cxx |4 ++--
31 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit f93a345ab5d35aadb5bbbd501df10ff2521c8104
Author: Andrea Gelmini
AuthorDate: Tue Jul 30 07:54:09 2019 +0200
Commit: Andrea Gelmini
CommitDate: Tue Jul 30 20:58:56 2019 +0200
Fix typos
Change-Id: Ib737ff364f627b9e4d0dc2a9903a07a0af36a8ae
Reviewed-on: https://gerrit.libreoffice.org/76551
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini
diff --git a/vcl/source/app/IconThemeScanner.cxx
b/vcl/source/app/IconThemeScanner.cxx
index 0e290eaf0617..0eba21837245 100644
--- a/vcl/source/app/IconThemeScanner.cxx
+++ b/vcl/source/app/IconThemeScanner.cxx
@@ -48,7 +48,7 @@ OUString convert_to_absolute_path(const OUString& path)
SAL_WARN("vcl.app", "Could not resolve path '" << path << "' to search
for icon themes.");
if (rc == osl::FileBase::E_MULTIHOP)
{
-throw std::runtime_error("Provided a recursive symlink to a icon
theme directory that could not be resolved.");
+throw std::runtime_error("Provided a recursive symlink to an icon
theme directory that could not be resolved.");
}
}
return resolver.m_aStatus.getFileURL();
@@ -143,7 +143,7 @@ IconThemeScanner::ReadIconThemesFromPath(const OUString&
dir)
/*static*/ bool
IconThemeScanner::FileIsValidIconTheme(const OUString& filename)
{
-// check whether we can construct a IconThemeInfo from it
+// check whether we can construct an IconThemeInfo from it
if (!IconThemeInfo::UrlCanBeParsed(filename)) {
SAL_INFO("vcl.app", "File '" << filename << "' does not seem to be an
icon theme.");
return false;
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index a84f07386d58..ae7eed0e2fba 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -84,7 +84,7 @@ static bool is_formatting_mark( sal_Unicode c )
/* #i100057# filter formatting marks out of strings before passing them to
the transliteration. The real solution would have been an additional
TransliterationModule
- to ignore these marks during transliteration; however changin the code in
i18npool that actually
+ to ignore these marks during transliteration; however changing the code in
i18npool that actually
implements this could produce unwanted side effects.
Of course this copying around is not really good, but looking at i18npool,
one more time
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index bf50e7bc6ce2..3f77e9220f83 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -679,7 +679,7 @@ public:
virtual VclPtr create_virtual_device() const override
{
-// create with (annoying) seperate alpha layer that LibreOffice itself
uses
+// create with (annoying) separate alpha layer that LibreOffice itself
uses
return VclPtr::Create(*Application::GetDefaultDevice(),
DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
}
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 5b343b5a83f4..be87437c06a2 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1576,7 +1576,7 @@ void MetricField::SetLast( sal_Int64 nNewLast, FieldUnit
eInUnit )
sal_Int
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-0' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 63ccc97e1699d90da2532e4294cdaff670ad1a3f
Author: Samuel Mehrbrodt
AuthorDate: Tue Jul 30 11:18:45 2019 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Jul 30 19:38:31 2019 +0200
tdf#126508 Fix crash when changing icon style
Regression from b58aa94f1f365c746135470bceb97cc182c289bc
Change-Id: I253447c197d8b333e26f243e26794e775f3edcee
Reviewed-on: https://gerrit.libreoffice.org/76590
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
(cherry picked from commit 857f68d68b3d0092f109845cfd93482871a0793d)
Reviewed-on: https://gerrit.libreoffice.org/76613
Reviewed-by: Julien Nabet
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 24660ef3dc2f..fce4732706b5 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -681,6 +681,8 @@ void SidebarController::SwitchToDeck (
const DeckDescriptor& rDeckDescriptor,
const Context& rContext)
{
+maFocusManager.Clear();
+
const bool bForceNewDeck
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
const bool bForceNewPanels
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
mnRequestedForceFlags = SwitchFlag_NoForce;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/qa desktop/source sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx |4
desktop/source/lib/init.cxx | 16
sfx2/source/sidebar/SidebarChildWindow.cxx | 10 +++---
3 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit 70d3bbe11e56f12a339a5b8759b53a96b4fe84ab
Author: Ashod Nakashian
AuthorDate: Thu May 2 23:16:30 2019 -0400
Commit: Noel Grandin
CommitDate: Tue Jul 30 18:52:48 2019 +0200
sfx2: Enable sidebar on calc and writer, but not in impress
Added by Noel to this commit:
And add a special deregister mode to doc_registerCallback
so we can unregister stack-based callback objects in the
presence of multiple views.
Reviewed-on: https://gerrit.libreoffice.org/71715
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit fba6d4267b3f827269d6550dcb003cc56b31e493)
Change-Id: I8d846bc1f794cf16fd45486fd83ef87f43fd52c7
Reviewed-on: https://gerrit.libreoffice.org/76555
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index e0647da2f6af..112f29f4c59e 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1939,6 +1939,7 @@ void DesktopLOKTest::testWriterCommentInsertCursor()
CPPUNIT_ASSERT(aView1.m_aOwnCursor.IsEmpty());
Scheduler::ProcessEventsToIdle();
+pDocument->m_pDocumentClass->registerCallback(pDocument, nullptr,
reinterpret_cast(1));
}
#if HAVE_MORE_FONTS
@@ -2210,6 +2211,8 @@ void DesktopLOKTest::testCommentsCallbacksWriter()
CPPUNIT_ASSERT(!aStream.str().empty());
boost::property_tree::read_json(aStream, aTree);
CPPUNIT_ASSERT_EQUAL(static_cast(5),
aTree.get_child("comments").size());
+
+pDocument->m_pDocumentClass->registerCallback(pDocument, nullptr,
reinterpret_cast(1));
}
void DesktopLOKTest::testRunMacro()
@@ -2629,6 +2632,7 @@ void DesktopLOKTest::testShowHideDialog()
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(std::string("invalidate"),
aView.m_aCallbackWindowResult.get("action"));
+pDocument->m_pDocumentClass->registerCallback(pDocument, nullptr,
reinterpret_cast(1));
}
namespace {
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f8d93534f44a..89078209ef43 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2828,6 +2828,22 @@ static void doc_registerCallback(LibreOfficeKitDocument*
pThis,
LibLODocument_Impl* pDocument = static_cast(pThis);
+// This is used by unit-tests to unregister stack-local callback objects
where we have multiple views
+// so we cannot rely on SfxLokHelper::getView
+if (pCallback == nullptr && pData != nullptr)
+{
+for (auto& pair1 : pDocument->mpCallbackFlushHandlers)
+{
+int nView = pair1.first;
+for (auto& pair2 : pDocument->mpCallbackFlushHandlers)
+{
+pair2.second->removeViewStates(nView);
+}
+pDocument->mpCallbackFlushHandlers[nView].reset(new
CallbackFlushHandler(pThis, nullptr, nullptr));
+}
+return;
+}
+
int nView = SfxLokHelper::getView();
if (nView < 0)
return;
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx
b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 678c5538aa0b..b958d840dd3b 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -33,7 +33,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow,
SID_SIDEBAR);
SidebarChildWindow::SidebarChildWindow(vcl::Window* pParentWindow, sal_uInt16
nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo)
: SfxChildWindow(pParentWindow, nId)
-, mbSidebarVisibleInLOK(pInfo && pInfo->aModule == "simpress")
+, mbSidebarVisibleInLOK(pInfo && (pInfo->aModule == "scalc" ||
pInfo->aModule == "swriter"))
{
auto pDockWin = VclPtr::Create(
pBindings, *this, pParentWindow, WB_STDDOCKWIN |
WB_OWNERDRAWDECORATION | WB_CLIPCHILDREN
@@ -53,8 +53,12 @@ SidebarChildWindow::SidebarChildWindow(vcl::Window*
pParentWindow, sal_uInt16 nI
// HACK: unfortunately I haven't found a clean solution to do
// this, so do it this way:
//
-pDockWin->SetSizePixel(Size(TabBar::GetDefaultWidth() *
GetWindow()->GetDPIScaleFactor(),
-pDockWin->GetSizePixel().Height()));
+if (!comphelper::LibreOfficeKit::isActive())
+{
+pDockWin->SetSizePixel(
+Size(TabBar::GetDefaultWidth() *
GetWindow()->GetDPIScaleFactor(),
+ pDockWin->GetSizePixel().Height()));
+}
}
pDockWin->Initialize(pInfo);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.fr
[Libreoffice-commits] core.git: sd/qa svx/source
sd/qa/uitest/impress_tests/tdf126605.py | 28
svx/source/svdraw/svdedtv1.cxx |2 --
2 files changed, 28 insertions(+), 2 deletions(-)
New commits:
commit 6eae30f631ec9b0f2b1415c06f4c36a3d6e13055
Author: Xisco Fauli
AuthorDate: Tue Jul 30 15:51:58 2019 +0200
Commit: Xisco Faulí
CommitDate: Tue Jul 30 18:39:26 2019 +0200
tdf#126605: Do not end TextEdit when changing an attribute
otherwise, pTextEditOutlinerView becomes nullptr in
svx/source/svdraw/svdedxv.cxx:2184
Regression from e6c7a018a0cfee395ce2886d41c908a2447ef5cc
Change-Id: I9d0645f637dc92b50d01682d119c0db60238e921
Reviewed-on: https://gerrit.libreoffice.org/76606
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sd/qa/uitest/impress_tests/tdf126605.py
b/sd/qa/uitest/impress_tests/tdf126605.py
new file mode 100644
index ..744324717a6b
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf126605.py
@@ -0,0 +1,28 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf126605(UITestCase):
+
+ def test_run(self):
+self.ui_test.create_doc_in_start_center("impress")
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+xDoc = self.xUITest.getTopFocusWindow()
+xEdit = xDoc.getChild("impress_win")
+xEdit.executeAction("TYPE", mkPropertyValues({"TEXT":"test"}))
+
+# Without the accompanying fix in place, it would crash at this point
+self.xUITest.executeCommand(".uno:ParaRightToLeft")
+self.xUITest.executeCommand(".uno:ParaLeftToRight")
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 44c4b2fe5201..b75099094576 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -765,8 +765,6 @@ void SdrEditView::SetNotPersistAttrToMarked(const
SfxItemSet& rAttr)
}
const bool bUndo = IsUndoEnabled();
-if( bUndo )
-EndTextEditAllViews();
// TODO: check if WhichRange is necessary.
const size_t nMarkCount=GetMarkedObjectCount();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/glade/libreoffice-catalog.xml.in |3 --- 1 file changed, 3 deletions(-) New commits: commit 4289b91d490b40420cb69d585937c892b2cb6261 Author: Caolán McNamara AuthorDate: Tue Jul 30 15:19:10 2019 +0100 Commit: Caolán McNamara CommitDate: Tue Jul 30 18:05:15 2019 +0200 svxlo-SvxCheckListBox doesn't exist, svxcorelo-SvxCheckListBox does Change-Id: I2aca664de328381e5beda5fb70bd58aa40f68abf Reviewed-on: https://gerrit.libreoffice.org/76612 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index a6d14e665c5a..1c69d1c76388 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -191,9 +191,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig sc/source
cui/uiconfig/ui/bulletandposition.ui | 368 ---
sc/source/core/data/table2.cxx |2
sc/source/ui/unoobj/fmtuno.cxx |2
3 files changed, 174 insertions(+), 198 deletions(-)
New commits:
commit 9ad8f83912e6cf14d7b3b3e1cb2a79d819247c82
Author: Aron Budea
AuthorDate: Sun Jul 28 05:51:40 2019 +0200
Commit: Aron Budea
CommitDate: Tue Jul 30 18:03:33 2019 +0200
tdf#125800: accessing cond format props in UNO throws error
These conditions were always evaluated to true: OR should
become AND when negated.
Regression from 8c637b47d9de4b3a64c33a9c2ffe7ed220be2467
Change-Id: I87038319ed27eff2bed2412da49e01f73ec0a79c
Reviewed-on: https://gerrit.libreoffice.org/76493
Reviewed-by: Gülşah Köse
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 5b182c897b4b..09aa36d30f53 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2191,7 +2191,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE
nArrCount, SCCOL nX1, SCC
for (size_t nEntry=0; nEntryGetEntry(nEntry);
-if(pEntry->GetType() !=
ScFormatEntry::Type::Condition ||
+if(pEntry->GetType() !=
ScFormatEntry::Type::Condition &&
pEntry->GetType() !=
ScFormatEntry::Type::ExtCondition)
continue;
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 51f271d42b91..484b011d57b7 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -161,7 +161,7 @@ ScTableConditionalFormat::ScTableConditionalFormat(
{
ScCondFormatEntryItem aItem;
const ScFormatEntry* pFrmtEntry = pFormat->GetEntry(i);
-if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition
||
+if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition
&&
pFrmtEntry->GetType() !=
ScFormatEntry::Type::ExtCondition)
continue;
commit 392fe03c2622a69c078adb9b993b5589e8b01d09
Author: Gülşah Köse
AuthorDate: Tue Jul 30 11:55:55 2019 +0300
Commit: Gülşah Köse
CommitDate: Tue Jul 30 18:03:28 2019 +0200
tdf#125642 Fix layout issues for Bullet dialog.
Change-Id: Ieacd060a8bfe4e2123e6973e30789e029ab02ca6
Reviewed-on: https://gerrit.libreoffice.org/76587
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
diff --git a/cui/uiconfig/ui/bulletandposition.ui
b/cui/uiconfig/ui/bulletandposition.ui
index c27d72e5dd4e..8e90e6219aab 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -403,73 +403,63 @@
0
none
-
+
True
False
-12
+6
-
-350
+
True
False
+Before:
+True
+prefix
+0
+
+
+0
+0
+
+
+
+
+130
+True
+True
start
-6
-17
-
-
-True
-False
-Before:
-True
-prefix
-0
-
-
-False
-True
-0
-
-
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source
cui/Library_cui.mk |1
cui/source/inc/radiobtnbox.hxx | 53 --
cui/source/options/optjava.cxx |1
cui/source/options/radiobtnbox.cxx | 86 -
4 files changed, 141 deletions(-)
New commits:
commit f356fbd7585ab2a41bcc6554a65b8a51588d0469
Author: Caolán McNamara
AuthorDate: Tue Jul 30 13:08:11 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 17:45:22 2019 +0200
drop newly unused SvxRadioButtonListBox
Change-Id: Idb80fa73fad6e4bb2a1eaa3d55d7fe90e86c8965
Reviewed-on: https://gerrit.libreoffice.org/76605
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 620d3de8fa69..df4a94126a63 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -182,7 +182,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/options/optupdt \
$(call gb_Helper_optional,DESKTOP,\
cui/source/options/personalization) \
-cui/source/options/radiobtnbox \
cui/source/options/sdbcdriverenum \
cui/source/options/securityoptions \
cui/source/options/treeopt \
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
deleted file mode 100644
index b9af0af621a0..
--- a/cui/source/inc/radiobtnbox.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CUI_SOURCE_INC_RADIOBTNBOX_HXX
-#define INCLUDED_CUI_SOURCE_INC_RADIOBTNBOX_HXX
-
-#include
-
-namespace svx {
-
-// class SvxRadioButtonListBox ---
-
-class SvxRadioButtonListBox : public SvSimpleTable
-{
-using SvSimpleTable::SetTabs;
-
-private:
-Point m_aCurMousePoint;
-
-protected:
-virtual voidMouseButtonUp( const MouseEvent& _rMEvt ) override;
-virtual voidKeyInput( const KeyEvent& rKEvt ) override;
-
-public:
-SvxRadioButtonListBox(SvSimpleTableContainer& rParent, WinBits nBits);
-
-voidHandleEntryChecked( SvTreeListEntry* _pEntry );
-
-const Point&GetCurMousePoint() const { return m_aCurMousePoint;}
-
-longGetControlColumnWidth() const;
-};
-
-} // end of namespace ::svx
-
-#endif // INCLUDED_CUI_SOURCE_INC_RADIOBTNBOX_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 23b61e7e8184..654d96ac879a 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -29,7 +29,6 @@
#include "optjava.hxx"
#include
#include
-#include
#include
#include
diff --git a/cui/source/options/radiobtnbox.cxx
b/cui/source/options/radiobtnbox.cxx
deleted file mode 100644
index 555232026a3e..
--- a/cui/source/options/radiobtnbox.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include
-
-#include
-#include
-
-namespace svx {
-
-// class SvxRadioButtonListBox
-
-SvxRadioButtonListBox::SvxRadioButtonListBox(SvSimpleTableContainer& rParent,
WinBits nBits)
-: SvSimpleTable(rParent, nBits)
-
-{
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source
sfx2/source/view/viewfrm.cxx | 56 ---
1 file changed, 56 deletions(-)
New commits:
commit 4236bb79017795bb743035d7d34690ed0df627fd
Author: Andras Timar
AuthorDate: Sun Jul 14 20:28:13 2019 +0200
Commit: Andras Timar
CommitDate: Tue Jul 30 17:44:57 2019 +0200
[cp] remove donate and community involvement infobars
Change-Id: I37c9c76eb88dea4effa786b62755ea8738efc3e0
Reviewed-on: https://gerrit.libreoffice.org/75600
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index ee298b2bc55c..e623ce9a6304 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1271,62 +1271,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
-// inform about the community involvement
-const sal_Int64 nLastGetInvolvedShown =
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
-const sal_Int64 nNow =
std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count();
-const sal_Int64 nPeriodSec(60 * 60 * 24 * 180); // 180 days in
seconds
-bool bUpdateLastTimeGetInvolvedShown = false;
-
-if (nLastGetInvolvedShown == 0)
-bUpdateLastTimeGetInvolvedShown = true;
-else if (nPeriodSec < nNow && nLastGetInvolvedShown < (nNow +
nPeriodSec/2) - nPeriodSec) // 90d alternating with donation
-{
-bUpdateLastTimeGetInvolvedShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("getinvolved", SfxResId(STR_GET_INVOLVED_TEXT),
InfoBarType::Info);
-
-VclPtrInstance
xGetInvolvedButton(&GetWindow());
-
xGetInvolvedButton->SetText(SfxResId(STR_GET_INVOLVED_BUTTON));
-
xGetInvolvedButton->SetSizePixel(xGetInvolvedButton->GetOptimalSize());
-xGetInvolvedButton->SetClickHdl(LINK(this, SfxViewFrame,
GetInvolvedHandler));
-pInfoBar->addButton(xGetInvolvedButton);
-}
-
-if (bUpdateLastTimeGetInvolvedShown
-&&
!officecfg::Setup::Product::LastTimeGetInvolvedShown::isReadOnly())
-{
-std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Setup::Product::LastTimeGetInvolvedShown::set(nNow, batch);
-batch->commit();
-}
-
-// inform about donations
-const sal_Int64 nLastDonateShown =
officecfg::Setup::Product::LastTimeDonateShown::get();
-bool bUpdateLastTimeDonateShown = false;
-
-if (nLastDonateShown == 0)
-bUpdateLastTimeDonateShown = true;
-else if (nPeriodSec < nNow && nLastDonateShown < nNow -
nPeriodSec) // 90d alternating with getinvolved
-{
-bUpdateLastTimeDonateShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("getdonate", SfxResId(STR_GET_DONATE_TEXT), InfoBarType::Info);
-
-VclPtrInstance xGetDonateButton(&GetWindow());
-xGetDonateButton->SetText(SfxResId(STR_GET_DONATE_BUTTON));
-
xGetDonateButton->SetSizePixel(xGetDonateButton->GetOptimalSize());
-xGetDonateButton->SetClickHdl(LINK(this, SfxViewFrame,
GetDonateHandler));
-pInfoBar->addButton(xGetDonateButton);
-}
-
-if (bUpdateLastTimeDonateShown
-&&
!officecfg::Setup::Product::LastTimeDonateShown::isReadOnly())
-{
-std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
-officecfg::Setup::Product::LastTimeDonateShown::set(nNow,
batch);
-batch->commit();
-}
-
// read-only infobar if necessary
const SfxViewShell *pVSh;
const SfxShell *pFSh;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/options/personalization.cxx | 51 -
cui/source/options/personalization.hxx | 11 +++
cui/uiconfig/ui/personalization_tab.ui |9 +++--
3 files changed, 31 insertions(+), 40 deletions(-)
New commits:
commit af20b49acb34694febf2a3ba79207b25a70a68cd
Author: Caolán McNamara
AuthorDate: Tue Jul 30 15:02:05 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 17:19:14 2019 +0200
weld SvxPersonalizationTabPage
Change-Id: I5240fc4237d8b471b2c23a8bc776cffa46a53285
Reviewed-on: https://gerrit.libreoffice.org/76607
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index e7c68fccb495..cdb6d805f525 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -44,45 +44,35 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::beans;
-SvxPersonalizationTabPage::SvxPersonalizationTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
-: SfxTabPage(pParent, "PersonalizationTabPage",
"cui/ui/personalization_tab.ui", &rSet)
+// persona
+SvxPersonalizationTabPage::SvxPersonalizationTabPage(TabPageParent pParent,
const SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/personalization_tab.ui",
"PersonalizationTabPage", &rSet)
+, m_xNoPersona(m_xBuilder->weld_radio_button("no_persona"))
+, m_xDefaultPersona(m_xBuilder->weld_radio_button("default_persona"))
{
-// persona
-get(m_pNoPersona, "no_persona");
-get(m_pDefaultPersona, "default_persona");
-
for (sal_uInt32 i = 0; i < MAX_DEFAULT_PERSONAS; ++i)
{
-OUString sDefaultId("default" + OUString::number(i));
-get(m_vDefaultPersonaImages[i], OUStringToOString(sDefaultId,
RTL_TEXTENCODING_UTF8));
-m_vDefaultPersonaImages[i]->SetClickHdl(
+OString sDefaultId("default" + OString::number(i));
+m_vDefaultPersonaImages[i] = m_xBuilder->weld_button(sDefaultId);
+m_vDefaultPersonaImages[i]->connect_clicked(
LINK(this, SvxPersonalizationTabPage, DefaultPersona));
}
LoadDefaultImages();
}
-SvxPersonalizationTabPage::~SvxPersonalizationTabPage() { disposeOnce(); }
-
-void SvxPersonalizationTabPage::dispose()
-{
-m_pNoPersona.clear();
-m_pDefaultPersona.clear();
-for (VclPtr& i : m_vDefaultPersonaImages)
-i.clear();
-SfxTabPage::dispose();
-}
+SvxPersonalizationTabPage::~SvxPersonalizationTabPage() {}
VclPtr SvxPersonalizationTabPage::Create(TabPageParent pParent,
const SfxItemSet* rSet)
{
-return VclPtr::Create(pParent.pParent, *rSet);
+return VclPtr::Create(pParent, *rSet);
}
bool SvxPersonalizationTabPage::FillItemSet(SfxItemSet*)
{
// persona
OUString aPersona("default");
-if (m_pNoPersona->IsChecked())
+if (m_xNoPersona->get_active())
aPersona = "no";
bool bModified = false;
@@ -128,9 +118,9 @@ void SvxPersonalizationTabPage::Reset(const SfxItemSet*)
}
if (aPersona == "no")
-m_pNoPersona->Check();
+m_xNoPersona->set_active(true);
else
-m_pDefaultPersona->Check();
+m_xDefaultPersona->set_active(true);
}
void SvxPersonalizationTabPage::LoadDefaultImages()
@@ -164,22 +154,21 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
INetURLObject aURLObj(gallery + aPreviewFile);
aFilter.ImportGraphic(aGraphic, aURLObj);
-BitmapEx aBmp = aGraphic.GetBitmapEx();
-m_vDefaultPersonaImages[nIndex]->SetModeImage(Image(aBmp));
-m_vDefaultPersonaImages[nIndex]->SetQuickHelpText(aName);
-m_vDefaultPersonaImages[nIndex++]->Show();
+m_vDefaultPersonaImages[nIndex]->set_image(aGraphic.GetXGraphic());
+m_vDefaultPersonaImages[nIndex]->set_tooltip_text(aName);
+m_vDefaultPersonaImages[nIndex++]->show();
foundOne = true;
}
-m_pDefaultPersona->Enable(foundOne);
+m_xDefaultPersona->set_sensitive(foundOne);
}
-IMPL_LINK(SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, void)
+IMPL_LINK(SvxPersonalizationTabPage, DefaultPersona, weld::Button&, rButton,
void)
{
-m_pDefaultPersona->Check();
+m_xDefaultPersona->set_active(true);
for (sal_Int32 nIndex = 0; nIndex < MAX_DEFAULT_PERSONAS; ++nIndex)
{
-if (pButton == m_vDefaultPersonaImages[nIndex])
+if (&rButton == m_vDefaultPersonaImages[nIndex].get())
m_aPersonaSettings = m_vDefaultPersonaSettings[nIndex];
}
}
diff --git a/cui/source/options/personalization.hxx
b/cui/source/options/personalization.hxx
index 7930016f5d62..09fb7956003e 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -20,18 +20,17 @@ class SvxPersonalizationTabPage : public SfxTabPage
using SfxTabPage::DeactivatePage;
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/options/optjava.cxx | 300 +
cui/source/options/optjava.hxx | 63 ---
cui/uiconfig/ui/optadvancedpage.ui | 235 +---
3 files changed, 280 insertions(+), 318 deletions(-)
New commits:
commit 1aa246a8e8c7d974ab0f7bdfa16cda36cb700e03
Author: Caolán McNamara
AuthorDate: Tue Jul 30 12:59:20 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 17:18:43 2019 +0200
weld SvxJavaOptionsPage
Change-Id: Ib37f6f554a890bd6397ae7b6c56f1615cd12b6b1
Reviewed-on: https://gerrit.libreoffice.org/76604
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index f5bcb94e0137..23b61e7e8184 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -68,113 +68,69 @@ using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-class SvxJavaListBox : public svx::SvxRadioButtonListBox
-{
-private:
-const OUString m_sAccessibilityText;
-public:
-SvxJavaListBox(SvSimpleTableContainer& rParent, const OUString
&rAccessibilityText)
-: SvxRadioButtonListBox(rParent, 0)
-, m_sAccessibilityText(rAccessibilityText)
-{
-}
-void setColSizes()
-{
-HeaderBar &rBar = GetTheHeaderBar();
-if (rBar.GetItemCount() < 4)
-return;
-long nCheckWidth = std::max(GetControlColumnWidth() + 12,
-rBar.LogicToPixel(Size(15, 0),
MapMode(MapUnit::MapAppFont)).Width());
-long nVersionWidth = 12 +
-std::max(rBar.GetTextWidth(rBar.GetItemText(3)),
-GetTextWidth("0.0.0_00-icedtea"));
-long nFeatureWidth = 12 +
-std::max(rBar.GetTextWidth(rBar.GetItemText(4)),
-GetTextWidth(m_sAccessibilityText));
-long nVendorWidth =
-std::max(GetSizePixel().Width() - (nCheckWidth + nVersionWidth +
nFeatureWidth),
-6 + std::max(rBar.GetTextWidth(rBar.GetItemText(2)),
-GetTextWidth("Sun Microsystems Inc.")));
-long aStaticTabs[]= { 0, 0, 0, 0 };
-aStaticTabs[1] = nCheckWidth;
-aStaticTabs[2] = aStaticTabs[1] + nVendorWidth;
-aStaticTabs[3] = aStaticTabs[2] + nVersionWidth;
-SvSimpleTable::SetTabs(SAL_N_ELEMENTS(aStaticTabs), aStaticTabs,
MapUnit::MapPixel);
-}
-virtual void Resize() override
-{
-svx::SvxRadioButtonListBox::Resize();
-setColSizes();
-}
-};
-
// class SvxJavaOptionsPage --
-
-SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const
SfxItemSet& rSet )
-: SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui",
&rSet)
+SvxJavaOptionsPage::SvxJavaOptionsPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optadvancedpage.ui", "OptAdvancedPage",
&rSet)
, m_aResetIdle("cui options SvxJavaOptionsPage Reset")
, xDialogListener(new ::svt::DialogClosedListener())
-{
-get(m_pJavaEnableCB, "javaenabled");
-get(m_pJavaBox, "javabox");
-get(m_pJavaPathText, "javapath");
-m_sInstallText = m_pJavaPathText->GetText();
-get(m_pAddBtn, "add");
-get(m_pParameterBtn, "parameters");
-get(m_pClassPathBtn, "classpath");
-get(m_pExperimentalCB, "experimental");
-get(m_pMacroCB, "macrorecording");
-get(m_pExpertConfigBtn, "expertconfig");
-m_pParentDlg.reset(
dynamic_cast(getNonLayoutParent(pParent)) );
-m_sAccessibilityText = get("a11y")->GetText();
-m_sAddDialogText = get("selectruntime")->GetText();
-
-SvSimpleTableContainer *pJavaListContainer =
get("javas");
-Size aControlSize(177, 60);
-aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
-pJavaListContainer->set_width_request(aControlSize.Width());
-pJavaListContainer->set_height_request(aControlSize.Height());
-m_pJavaList = VclPtr::Create(*pJavaListContainer,
m_sAccessibilityText);
-
-long const aStaticTabs[]= { 0, 0, 0, 0 };
-m_pJavaList->SvSimpleTable::SetTabs( SAL_N_ELEMENTS(aStaticTabs),
aStaticTabs );
-
-OUString sHeader ( "\t" + get("vendor")->GetText() +
-"\t" + get("version")->GetText() +
-"\t" + get("features")->GetText() +
-"\t" );
-m_pJavaList->InsertHeaderEntry(sHeader, HEADERBAR_APPEND,
HeaderBarItemBits::LEFT);
-m_pJavaList->setColSizes();
-
-m_pJavaEnableCB->SetClickHdl( LINK( this, SvxJavaOptionsPage,
EnableHdl_Impl ) );
-m_pJavaList->SetCheckButtonHdl( LINK( this, SvxJavaOptionsPage,
CheckHdl_Impl ) );
-m_pJavaList->SetSelectHdl( LINK( this, SvxJavaOptionsPage, SelectHdl_Impl
) );
-m_pAddBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, AddHdl_Impl ) );
-m_pParameterBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage,
ParameterHdl_Impl ) );
-m_pC
[Libreoffice-commits] core.git: chart2/inc sw/qa
chart2/inc/strings.hrc |4 ++--
sw/qa/extras/layout/layout.cxx | 15 ++-
2 files changed, 8 insertions(+), 11 deletions(-)
New commits:
commit 4fe32e65cc56cec959af811a9a99348e764e4966
Author: Gabor Kelemen
AuthorDate: Thu Jul 25 12:49:15 2019 +0200
Commit: Andras Timar
CommitDate: Tue Jul 30 16:48:06 2019 +0200
tdf#126524 Use shorter default name for unnamed data series
Change-Id: I2c67a50c36f6b09dc15d70ec44b95d47792b33e2
Reviewed-on: https://gerrit.libreoffice.org/76298
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc
index c991de019bc2..163b0f44e902 100644
--- a/chart2/inc/strings.hrc
+++ b/chart2/inc/strings.hrc
@@ -134,8 +134,8 @@
#define STR_DATA_ROLE_MIN NC_("STR_DATA_ROLE_MIN",
"Low Values")
#define STR_DATA_ROLE_MAX NC_("STR_DATA_ROLE_MAX",
"High Values")
#define STR_DATA_ROLE_CATEGORIES
NC_("STR_DATA_ROLE_CATEGORIES", "Categories")
-#define STR_DATA_UNNAMED_SERIES
NC_("STR_DATA_UNNAMED_SERIES", "Unnamed Series")
-#define STR_DATA_UNNAMED_SERIES_WITH_INDEX
NC_("STR_DATA_UNNAMED_SERIES_WITH_INDEX", "Unnamed Series %NUMBER")
+#define STR_DATA_UNNAMED_SERIES
NC_("STR_DATA_UNNAMED_SERIES", "Series")
+#define STR_DATA_UNNAMED_SERIES_WITH_INDEX
NC_("STR_DATA_UNNAMED_SERIES_WITH_INDEX", "Series%NUMBER")
#define STR_DATA_SELECT_RANGE_FOR_SERIES
NC_("STR_DATA_SELECT_RANGE_FOR_SERIES", "Select Range for %VALUETYPE of
%SERIESNAME")
#define STR_DATA_SELECT_RANGE_FOR_CATEGORIES
NC_("STR_DATA_SELECT_RANGE_FOR_CATEGORIES", "Select Range for Categories")
#define STR_DATA_SELECT_RANGE_FOR_DATALABELS
NC_("STR_DATA_SELECT_RANGE_FOR_DATALABELS", "Select Range for data labels")
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index eec90ca933b8..84728d8e2254 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2230,17 +2230,14 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf75659)
xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
CPPUNIT_ASSERT(pXmlDoc);
-assertXPathContent(pXmlDoc,
-
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[17]/text",
- "Unnamed Series 1");
+assertXPathContent(
+pXmlDoc,
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[17]/text",
"Series1");
-assertXPathContent(pXmlDoc,
-
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[18]/text",
- "Unnamed Series 2");
+assertXPathContent(
+pXmlDoc,
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[18]/text",
"Series2");
-assertXPathContent(pXmlDoc,
-
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[19]/text",
- "Unnamed Series 3");
+assertXPathContent(
+pXmlDoc,
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[19]/text",
"Series3");
// These failed, if the legend names are empty strings.
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoxml/source
unoxml/source/rdf/librdf_repository.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ee1900a01c61e656de5b3c14446b9513cf83c7fc
Author: Michael Stahl
AuthorDate: Tue Jul 30 16:22:43 2019 +0200
Commit: Michael Stahl
CommitDate: Tue Jul 30 16:25:18 2019 +0200
unordf: oops, and we forgot to amend with <= instead of <
... in 751a5ad9c4e75fd1019bd4bca940d8a9e73f171a
Change-Id: I81fb9e12b02eedd0fc6f4deccc392543cf2c14da
Reviewed-on: https://gerrit.libreoffice.org/76614
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/unoxml/source/rdf/librdf_repository.cxx
b/unoxml/source/rdf/librdf_repository.cxx
index e775be583bf0..4e7b8382b5a6 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -566,7 +566,7 @@ css::uno::Any SAL_CALL
librdf_GraphResult2::nextElement()
{
std::size_t const n = m_nIndex++;
-if (m_vStatements.size() < n)
+if (m_vStatements.size() <= n)
{
m_nIndex = m_vStatements.size(); // avoid overflow
throw container::NoSuchElementException();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 857f68d68b3d0092f109845cfd93482871a0793d
Author: Samuel Mehrbrodt
AuthorDate: Tue Jul 30 11:18:45 2019 +0200
Commit: Xisco Faulí
CommitDate: Tue Jul 30 16:24:22 2019 +0200
tdf#126508 Fix crash when changing icon style
Regression from b58aa94f1f365c746135470bceb97cc182c289bc
Change-Id: I253447c197d8b333e26f243e26794e775f3edcee
Reviewed-on: https://gerrit.libreoffice.org/76590
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 24660ef3dc2f..fce4732706b5 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -681,6 +681,8 @@ void SidebarController::SwitchToDeck (
const DeckDescriptor& rDeckDescriptor,
const Context& rContext)
{
+maFocusManager.Clear();
+
const bool bForceNewDeck
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
const bool bForceNewPanels
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
mnRequestedForceFlags = SwitchFlag_NoForce;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoxml/source
unoxml/source/rdf/librdf_repository.cxx | 65
1 file changed, 42 insertions(+), 23 deletions(-)
New commits:
commit 751a5ad9c4e75fd1019bd4bca940d8a9e73f171a
Author: Michael Stahl
AuthorDate: Tue Jul 30 15:30:39 2019 +0200
Commit: Michael Stahl
CommitDate: Tue Jul 30 16:21:23 2019 +0200
unordf: restore thread safety
(regression from f2c513e686536dc308609c56fa9354d4d10b072c)
Change-Id: I620d726555172fbaec3d468bcf21c0c1101cdc70
Reviewed-on: https://gerrit.libreoffice.org/76601
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/unoxml/source/rdf/librdf_repository.cxx
b/unoxml/source/rdf/librdf_repository.cxx
index 26f4a950518c..e775be583bf0 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
@@ -243,12 +244,12 @@ public:
Statement const& i_rStatement);
static std::shared_ptr extractResource_NoLock(
const uno::Reference< rdf::XResource > & i_xResource);
-static void extractResourceToCacheKey(
+static void extractResourceToCacheKey_NoLock(
const uno::Reference< rdf::XResource > & i_xResource,
OUStringBuffer& rBuf);
static std::shared_ptr extractNode_NoLock(
const uno::Reference< rdf::XNode > & i_xNode);
-static void extractNodeToCacheKey(
+static void extractNodeToCacheKey_NoLock(
const uno::Reference< rdf::XNode > & i_xNode,
OUStringBuffer& rBuffer);
static Statement extractStatement_NoLock(
@@ -550,7 +551,7 @@ public:
private:
std::vector m_vStatements;
-int m_nIndex = 0;
+std::atomic m_nIndex = 0;
};
@@ -558,16 +559,19 @@ private:
sal_Bool SAL_CALL
librdf_GraphResult2::hasMoreElements()
{
-return m_nIndex < static_cast(m_vStatements.size());
+return m_nIndex < m_vStatements.size();
}
css::uno::Any SAL_CALL
librdf_GraphResult2::nextElement()
{
-if (m_nIndex >= static_cast(m_vStatements.size()))
+std::size_t const n = m_nIndex++;
+if (m_vStatements.size() < n)
+{
+m_nIndex = m_vStatements.size(); // avoid overflow
throw container::NoSuchElementException();
-m_nIndex++;
-return uno::makeAny(m_vStatements[m_nIndex-1]);
+}
+return uno::makeAny(m_vStatements[n]);
}
/** result of tuple queries ("SELECT").
@@ -731,7 +735,7 @@ private:
librdf_NamedGraph(librdf_NamedGraph const&) = delete;
librdf_NamedGraph& operator=(librdf_NamedGraph const&) = delete;
-static OUString createCacheKey(
+static OUString createCacheKey_NoLock(
const uno::Reference< rdf::XResource > & i_xSubject,
const uno::Reference< rdf::XURI > & i_xPredicate,
const uno::Reference< rdf::XNode > & i_xObject);
@@ -741,8 +745,9 @@ private:
librdf_Repository *const m_pRep;
uno::Reference< rdf::XURI > const m_xName;
-// Querying is rather slow, so cache the results.
+/// Querying is rather slow, so cache the results.
std::map> m_aStatementsCache;
+::osl::Mutex m_CacheMutex;
};
@@ -784,6 +789,7 @@ void SAL_CALL librdf_NamedGraph::clear()
throw lang::WrappedTargetRuntimeException( ex.Message,
*this, anyEx );
}
+::osl::MutexGuard g(m_CacheMutex);
m_aStatementsCache.clear();
}
@@ -797,7 +803,10 @@ void SAL_CALL librdf_NamedGraph::addStatement(
throw rdf::RepositoryException(
"librdf_NamedGraph::addStatement: repository is gone", *this);
}
-m_aStatementsCache.clear();
+{
+::osl::MutexGuard g(m_CacheMutex);
+m_aStatementsCache.clear();
+}
m_pRep->addStatementGraph_NoLock(
i_xSubject, i_xPredicate, i_xObject, m_xName);
}
@@ -812,22 +821,25 @@ void SAL_CALL librdf_NamedGraph::removeStatements(
throw rdf::RepositoryException(
"librdf_NamedGraph::removeStatements: repository is gone", *this);
}
-m_aStatementsCache.clear();
+{
+::osl::MutexGuard g(m_CacheMutex);
+m_aStatementsCache.clear();
+}
m_pRep->removeStatementsGraph_NoLock(
i_xSubject, i_xPredicate, i_xObject, m_xName);
}
-OUString librdf_NamedGraph::createCacheKey(
+OUString librdf_NamedGraph::createCacheKey_NoLock(
const uno::Reference< rdf::XResource > & i_xSubject,
const uno::Reference< rdf::XURI > & i_xPredicate,
const uno::Reference< rdf::XNode > & i_xObject)
{
OUStringBuffer cacheKey(256);
-librdf_TypeConverter::extractResourceToCacheKey(i_xSubject, cacheKey);
+librdf_TypeConverter::extractResourceToCacheKey_NoLock(i_xSubject,
cacheKey);
cacheKey.append("\t");
-librdf_TypeConverter::extractResourceToCacheKey(i_xPredicate, cacheKey);
+librdf_TypeConverter::extractResourceToCacheKey_NoLock(i_xPredicate,
cacheKey);
cacheKey.append("\t");
-librdf_TypeConverter::extractNodeToCacheKey(i_x
[Libreoffice-commits] core.git: shell/source
shell/source/win32/simplemail/senddoc.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e79f61340405dcc75f3fe41f727dea4ba4202c2e
Author: Jan-Marek Glogowski
AuthorDate: Tue Jul 23 13:48:47 2019 +0200
Commit: Jan-Marek Glogowski
CommitDate: Tue Jul 30 16:15:16 2019 +0200
tdf#126597 don't use modeless dialog for senddoc.exe
There is already a large comment in initAttachmentList about
problems with MAPI_DIALOG_MODELESS. Using MAPI_DIALOG_MODELESS with
Outlook 2016 and multiple attachments sometimes produces a
MAPI_E_FAILURE, but most times it crashes for me. And it's not a
problem with the removed temporary files, as uncommenting that
shows the same problem. And there seems to be many more problems:
https://social.msdn.microsoft.com/Forums/en-US/5d8fece6-9d93-490c-9331-625c17e3291d/mapisendmailhelper-and-mapidialogmodeless
But actually I don't see any blocking of LO, if I switch to
using MAPI_DIALOG, as senddoc.exe already runs in the background.
So this switches MAPI_DIALOG_MODELESS to MAPI_DIALOG.
This reverts commit 5874c76371562c3e2d8564b1fb04df1997091d27
("tdf#116074: Use modeless dialogs with supporting mailers").
Change-Id: Ie0f8f22196d1a174dfeada2bc4aabb1717ee16a7
Reviewed-on: https://gerrit.libreoffice.org/76155
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/shell/source/win32/simplemail/senddoc.cxx
b/shell/source/win32/simplemail/senddoc.cxx
index b685cc906104..a7a87fdb2a25 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -207,8 +207,9 @@ static void initParameter(int argc, wchar_t* argv[])
if (_wcsicmp(argv[i], L"--mapi-dialog") == 0)
{
-// Outlook 2013+; for earlier versions this equals to MAPI_DIALOG
-gMapiFlags |= MAPI_DIALOG_MODELESS;
+// MAPI_DIALOG_MODELESS has many problems and crashes Outlook 2016.
+// see the commit message for a lengthy description.
+gMapiFlags |= MAPI_DIALOG;
}
else if (_wcsicmp(argv[i], L"--mapi-logon-ui") == 0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/LibreOfficeKit libreofficekit/source sc/source
include/LibreOfficeKit/LibreOfficeKitEnums.h | 18 ++-
libreofficekit/source/gtk/lokdocview.cxx |4 ++
sc/source/ui/view/gridwin.cxx| 44 ---
3 files changed, 55 insertions(+), 11 deletions(-)
New commits:
commit f7e051d4848c37bde868e62ac9497461b488f9c6
Author: Tomaž Vajngerl
AuthorDate: Sun Jul 28 10:04:58 2019 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Jul 30 16:14:43 2019 +0200
lok: send cell selection rectangle and cell area fill rectangle
Instead of text selection start/end for cell selection we send a
cell selection rectangle event. This is needed so we're able to
differentiate when to draw cell selection and text selection
markers.
In addition send cell fill area rectangle, which is the area where
we need to hit to trigger area fill functionality in Calc.
Reviewed-on: https://gerrit.libreoffice.org/76491
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit 23ed3a19cb0d53639d817af9b802a44977e89c65)
Change-Id: I54af958932815818a1a4d48364192ba43f1df7de
Reviewed-on: https://gerrit.libreoffice.org/76571
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 2c29ef201519..ddcb9003853d 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -648,7 +648,23 @@ typedef enum
* Profiling tracing information single string of multiple lines
* containing and zone start/stop information
*/
-LOK_CALLBACK_PROFILE_FRAME = 41
+LOK_CALLBACK_PROFILE_FRAME = 41,
+
+/**
+ * The position and size of the cell selection area. It is used to
+ * draw the selection handles for cells in Calc documents.
+ *
+ * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
+ */
+LOK_CALLBACK_CELL_SELECTION_AREA = 42,
+
+/**
+ * The position and size of the cell auto fill area. It is used to
+ * trigger auto fill functionality if that area is hit.
+ *
+ * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
+ */
+LOK_CALLBACK_CELL_AUTO_FILL_AREA = 43,
}
LibreOfficeKitCallbackType;
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 1e08a42cf7cd..040a9f3bc7b4 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -452,6 +452,10 @@ callbackTypeToString (int nType)
return "LOK_CALLBACK_SIGNATURE_STATUS";
case LOK_CALLBACK_PROFILE_FRAME:
return "LOK_CALLBACK_PROFILE_FRAME";
+case LOK_CALLBACK_CELL_SELECTION_AREA:
+return "LOK_CALLBACK_CELL_SELECTION_AREA";
+case LOK_CALLBACK_CELL_AUTO_FILL_AREA:
+return "LOK_CALLBACK_CELL_AUTO_FILL_AREA";
}
g_assert(false);
return nullptr;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5bce39050830..df13a2ee82bc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5862,23 +5862,41 @@ static void updateLibreOfficeKitSelection(const
ScViewData* pViewData, const std
return;
// selection start handle
-tools::Rectangle aStart(aBoundingBox.Left() / nPPTX, aBoundingBox.Top() /
nPPTY,
-aBoundingBox.Left() / nPPTX, (aBoundingBox.Top() / nPPTY) + 256);
-
-// selection end handle
-tools::Rectangle aEnd(aBoundingBox.Right() / nPPTX, (aBoundingBox.Bottom()
/ nPPTY) - 256,
+tools::Rectangle aRectangle(
+aBoundingBox.Left() / nPPTX, aBoundingBox.Top() / nPPTY,
aBoundingBox.Right() / nPPTX, aBoundingBox.Bottom() / nPPTY);
// the selection itself
OString aSelection = comphelper::string::join("; ", aRectangles).getStr();
ScTabViewShell* pViewShell = pViewData->GetViewShell();
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION_START,
aStart.toString().getStr());
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION_END,
aEnd.toString().getStr());
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_SELECTION_AREA,
aRectangle.toString().getStr());
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION,
aSelection.getStr());
SfxLokHelper::notifyOtherViews(pViewShell,
LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", aSelection.getStr());
}
+namespace
+{
+
+void updateLibreOfficeKitAutoFill(const ScViewData* pViewData,
tools::Rectangle const & rRectangle)
+{
+if (!comphelper::LibreOfficeKit::isActive())
+return;
+
+double nPPTX = pViewData->GetPPTX();
+double nPPTY = pViewData->GetPPTY();
+
+// selection start handle
+tools::Rectangle aLogicRectangle(
+rRectangle.Left() / nPPTX, rRectangle.Top() / nPPTY,
+rRectangle.Right() / nPPTX, rRecta
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swxform/toolbar/formdesign.xml |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6fee2e7ec0b563d164e1d2317d6ec41bee0dac31 Author: andreas kainz AuthorDate: Tue Jul 30 12:29:48 2019 +0200 Commit: andreas_kainz CommitDate: Tue Jul 30 16:05:49 2019 +0200 tdf#126611 ShowDataNavigator in swxform Change-Id: I8997ca84434f49b6e9dadd7e283455e40b90892e Reviewed-on: https://gerrit.libreoffice.org/76593 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swxform/toolbar/formdesign.xml b/sw/uiconfig/swxform/toolbar/formdesign.xml index 1d4a5c96c6d9..067ddff0675f 100644 --- a/sw/uiconfig/swxform/toolbar/formdesign.xml +++ b/sw/uiconfig/swxform/toolbar/formdesign.xml @@ -49,8 +49,9 @@ + - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-0' - sfx2/source
sfx2/source/doc/objmisc.cxx | 29 -
1 file changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 5c3ba8ae6bc2521b44a78b33e354fe906a74014e
Author: Caolán McNamara
AuthorDate: Fri Jul 26 13:25:31 2019 +0100
Commit: Christian Lohmaier
CommitDate: Tue Jul 30 14:41:37 2019 +0200
decode url escape codes and check each path segment
Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1
Reviewed-on: https://gerrit.libreoffice.org/76395
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit 0344b7684753876a3148a47d1e131a1b13595f63)
Reviewed-on: https://gerrit.libreoffice.org/76538
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 0e188b925784..8a6ff1b41611 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -43,6 +43,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -1347,7 +1349,32 @@ namespace
// don't allow LibreLogo to be used with our mouseover/etc dom-alike events
bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL)
{
-return
rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo");
+if (!rScriptURL.startsWith("vnd.sun.star.script:"))
+return false;
+
+// ensure URL Escape Codes are decoded
+css::uno::Reference uri(
+
css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL));
+css::uno::Reference sfUri(uri,
css::uno::UNO_QUERY);
+
+if (!sfUri.is())
+return false;
+
+OUString sScript = sfUri->getName();
+
+// check if any path portion matches LibreLogo and ban it if it does
+sal_Int32 nIndex = 0;
+do
+{
+OUString aToken = sScript.getToken(0, '/', nIndex);
+if (aToken.startsWithIgnoreAsciiCase("LibreLogo"))
+{
+return true;
+}
+}
+while (nIndex >= 0);
+
+return false;
}
ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >&
_rxScriptContext, const OUString& _rScriptURL,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/pt/DocumentList.xml | 14 ++ 1 file changed, 14 insertions(+) New commits: commit 9ee5ad5a0b84bfa652da34694ba4f75668f06087 Author: Marco A.G.Pinto AuthorDate: Tue Jul 30 08:39:35 2019 +0200 Commit: Andras Timar CommitDate: Tue Jul 30 14:41:37 2019 +0200 [pt_PT] Added 14 words to autocorrect Change-Id: Iaae705b469463e302059c4be7b9f1c7968011824 Reviewed-on: https://gerrit.libreoffice.org/76577 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml b/extras/source/autocorr/lang/pt/DocumentList.xml index 8550c34c3ae5..0e156bc93702 100644 --- a/extras/source/autocorr/lang/pt/DocumentList.xml +++ b/extras/source/autocorr/lang/pt/DocumentList.xml @@ -272,6 +272,8 @@ + + @@ -329,6 +331,8 @@ + + @@ -581,10 +585,12 @@ + + @@ -968,6 +974,7 @@ + @@ -1130,6 +1137,7 @@ + @@ -1209,6 +1217,8 @@ + + @@ -1271,6 +1281,7 @@ + @@ -1893,6 +1904,7 @@ + @@ -2097,6 +2109,8 @@ + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-0' - include/sfx2 sfx2/source
include/sfx2/objsh.hxx |2 ++
sfx2/source/doc/objmisc.cxx |6 +-
sfx2/source/notify/eventsupplier.cxx | 18 --
3 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 70d022f6f134e67ffa9e65ca2a6de64e458a7db0
Author: Caolán McNamara
AuthorDate: Tue Jul 23 15:31:05 2019 +0100
Commit: Christian Lohmaier
CommitDate: Tue Jul 30 14:36:54 2019 +0200
expand LibreLogo check to global events
Change-Id: I7f436983ba0eb4b76b02d08ee52626e54b103d5f
Reviewed-on: https://gerrit.libreoffice.org/76194
Tested-by: Jenkins
Reviewed-by: Michael Stahl
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 85cbe1f06703c0b8e1f15a3d969202d99c66f34b)
Reviewed-on: https://gerrit.libreoffice.org/76540
Reviewed-by: Stephan Bergmann
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index eaa93afd72da..d982aa1d20d7 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -392,6 +392,8 @@ public:
*/
boolAdjustMacroMode();
+static bool UnTrustedScript(const OUString& rScriptURL);
+
SvKeyValueIterator* GetHeaderAttributes();
voidClearHeaderAttributesForSourceViewHack();
voidSetHeaderAttributesForSourceViewHack();
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index d44b55e6b753..0e188b925784 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1344,16 +1344,12 @@ namespace
}
}
-namespace {
-
// don't allow LibreLogo to be used with our mouseover/etc dom-alike events
-bool UnTrustedScript(const OUString& rScriptURL)
+bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL)
{
return
rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo");
}
-}
-
ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >&
_rxScriptContext, const OUString& _rScriptURL,
const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >&
aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const
css::uno::Any* pCaller )
{
diff --git a/sfx2/source/notify/eventsupplier.cxx
b/sfx2/source/notify/eventsupplier.cxx
index 0be25c894451..b434122ed789 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -206,18 +206,24 @@ void SfxEvents_Impl::Execute( uno::Any const &
aEventData, const document::Docum
else if (aType == "Service" ||
aType == "Script")
{
-if ( !aScript.isEmpty() )
+bool bAllowed = false;
+util::URL aURL;
+if (!aScript.isEmpty())
{
-SfxViewFrame* pView = pDoc ?
-SfxViewFrame::GetFirst( pDoc ) :
-SfxViewFrame::Current();
-
uno::Reference < util::XURLTransformer > xTrans(
util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
-util::URL aURL;
aURL.Complete = aScript;
xTrans->parseStrict( aURL );
+bAllowed = !SfxObjectShell::UnTrustedScript(aURL.Complete);
+}
+
+if (bAllowed)
+{
+SfxViewFrame* pView = pDoc ?
+SfxViewFrame::GetFirst( pDoc ) :
+SfxViewFrame::Current();
+
uno::Reference
< frame::XDispatchProvider > xProv;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSoC19 - Android Viewer(Online) - Weekly report [22 July - 27 July]
Project: LibreOffice Android Viewer(Online) In week(from 22 July to 27 July), I have added the support of screen dimming from JS side (https://gerrit.libreoffice.org/#/c/76489/) in the document viewer, and ported some old directory based patches. Thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - editeng/source
editeng/source/editeng/impedit.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e74a67b5a4dac004901fe08bf0d76682badeb6ab
Author: Tor Lillqvist
AuthorDate: Tue Jul 30 11:48:19 2019 +0300
Commit: Tor Lillqvist
CommitDate: Tue Jul 30 14:27:24 2019 +0200
tdf#125568: We need the selection string also when not "in selection mode"
Apparently being "in selection mode" has nothing to do with whether we
have a selection that we are enlarging by dragging the end marker?
Change-Id: I546a1685bd3a0102e16c1f8bc6e721819ed986e2
Reviewed-on: https://gerrit.libreoffice.org/76588
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/76592
Reviewed-by: Tor Lillqvist
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 0f91a4fa24eb..edf393485b87 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -403,7 +404,10 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel,
vcl::Region* pRegion,
OString sRectangle;
// If we are not in selection mode, then the exported own
selection should be empty.
-if (pEditEngine->pImpEditEngine->IsInSelectionMode() ||
mpOtherShell)
+// This is needed always in Online, regardless whether in
"selection mode" (whatever
+// that is) or not, for tdf#125568, but I don't have the clout to
make this completely
+// unconditional also for desktop LO.
+if (comphelper::LibreOfficeKit::isActive() ||
pEditEngine->pImpEditEngine->IsInSelectionMode() || mpOtherShell)
{
std::vector aRectangles;
pRegion->GetRegionRectangles(aRectangles);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svx svx/source
cui/source/options/optgdlg.cxx | 347 +++-
cui/source/options/optgdlg.hxx | 45 ++--
cui/uiconfig/ui/optlanguagespage.ui | 84
include/svx/langbox.hxx |6
svx/source/dialog/langbox.cxx | 19 +
5 files changed, 269 insertions(+), 232 deletions(-)
New commits:
commit 08101a1ab3b5d7c41488e93a2af518462286844f
Author: Caolán McNamara
AuthorDate: Tue Jul 30 11:41:12 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 14:04:17 2019 +0200
weld OfaLanguagesTabPage
Change-Id: Ib0938f0c9d810c0f851dd0180093aabb4babdc19
Reviewed-on: https://gerrit.libreoffice.org/76594
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 32802f75a3ed..63ad892a2d27 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -302,7 +302,6 @@ OfaMiscTabPage::OfaMiscTabPage(TabPageParent pParent, const
SfxItemSet& rSet)
OfaMiscTabPage::~OfaMiscTabPage()
{
-disposeOnce();
}
VclPtr OfaMiscTabPage::Create( TabPageParent pParent, const
SfxItemSet* rAttrSet )
@@ -737,7 +736,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
case 2: eSet = SFX_SYMBOLS_SIZE_LARGE; break;
case 3: eSet = SFX_SYMBOLS_SIZE_32; break;
default:
-OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of
m_pIconSizeLB should not be possible!" );
+OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of
m_xIconSizeLB should not be possible!" );
}
aMiscOptions.SetSymbolsSize( eSet );
}
@@ -753,7 +752,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
case 1: eSet = ToolBoxButtonSize::Small; break;
case 2: eSet = ToolBoxButtonSize::Large; break;
default:
-OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of
m_pSidebarIconSizeLB should not be possible!" );
+OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of
m_xSidebarIconSizeLB should not be possible!" );
}
aMiscOptions.SetSidebarIconSize( eSet );
}
@@ -1098,34 +1097,29 @@ namespace
}
}
-OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const
SfxItemSet& rSet)
-: SfxTabPage(pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui",
&rSet)
+OfaLanguagesTabPage::OfaLanguagesTabPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optlanguagespage.ui", "OptLanguagesPage",
&rSet)
, pLangConfig(new LanguageConfig_Impl)
, m_bDatePatternsValid(false)
+, m_xUserInterfaceLB(m_xBuilder->weld_combo_box("userinterface"))
+, m_xLocaleSettingFT(m_xBuilder->weld_label("localesettingFT"))
+, m_xLocaleSettingLB(new
LanguageBox(m_xBuilder->weld_combo_box("localesetting")))
+, m_xDecimalSeparatorCB(m_xBuilder->weld_check_button("decimalseparator"))
+, m_xCurrencyFT(m_xBuilder->weld_label("defaultcurrency"))
+, m_xCurrencyLB(m_xBuilder->weld_combo_box("currencylb"))
+, m_xDatePatternsFT(m_xBuilder->weld_label("dataaccpatterns"))
+, m_xDatePatternsED(m_xBuilder->weld_entry("datepatterns"))
+, m_xWesternLanguageLB(new
LanguageBox(m_xBuilder->weld_combo_box("westernlanguage")))
+, m_xWesternLanguageFT(m_xBuilder->weld_label("western"))
+, m_xAsianLanguageLB(new
LanguageBox(m_xBuilder->weld_combo_box("asianlanguage")))
+, m_xComplexLanguageLB(new
LanguageBox(m_xBuilder->weld_combo_box("complexlanguage")))
+, m_xCurrentDocCB(m_xBuilder->weld_check_button("currentdoc"))
+, m_xAsianSupportCB(m_xBuilder->weld_check_button("asiansupport"))
+, m_xCTLSupportCB(m_xBuilder->weld_check_button("ctlsupport"))
+,
m_xIgnoreLanguageChangeCB(m_xBuilder->weld_check_button("ignorelanguagechange"))
{
-get(m_pUserInterfaceLB, "userinterface");
-m_pUserInterfaceLB->SetStyle(m_pUserInterfaceLB->GetStyle() | WB_SORT);
-get(m_pLocaleSettingLB, "localesetting");
-m_pLocaleSettingLB->SetStyle(m_pLocaleSettingLB->GetStyle() | WB_SORT);
-get(m_pLocaleSettingFT, "localesettingFT");
-get(m_pDecimalSeparatorCB, "decimalseparator");
-get(m_pCurrencyFT, "defaultcurrency");
-get(m_pCurrencyLB, "currencylb");
-m_pCurrencyLB->SetStyle(m_pCurrencyLB->GetStyle() | WB_SORT);
-get(m_pDatePatternsFT,"dataaccpatterns");
-get(m_pDatePatternsED, "datepatterns");
-
-get(m_pWesternLanguageLB, "westernlanguage");
-m_pWesternLanguageLB->SetStyle(m_pWesternLanguageLB->GetStyle() | WB_SORT);
-get(m_pWesternLanguageFT, "western");
-get(m_pAsianLanguageLB, "asianlanguage");
-m_pAsianLanguageLB->SetStyle(m_pAsianLanguageLB->GetStyle() | WB_SORT);
-get(m_pComplexLanguageLB, "complexlanguage");
-m_pComplexLanguageLB->SetStyle(m_pComplexLanguageLB->GetStyle() | WB_SORT);
-get(m_pCurrentDocCB, "currentdoc");
-get(m_pAsian
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 30a75a8d3dcfcca2cf349d9df797ac0b1550eb5e
Author: Tor Lillqvist
AuthorDate: Tue Jul 30 11:48:19 2019 +0300
Commit: Tor Lillqvist
CommitDate: Tue Jul 30 14:01:42 2019 +0200
tdf#125568: We need the selection string also when not "in selection mode"
Apparently being "in selection mode" has nothing to do with whether we
have a selection that we are enlarging by dragging the end marker?
Change-Id: I546a1685bd3a0102e16c1f8bc6e721819ed986e2
Reviewed-on: https://gerrit.libreoffice.org/76588
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/76591
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index a30d658ba492..5b7de9ae81e3 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -411,7 +412,10 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel,
vcl::Region* pRegion,
OString sRectangle;
// If we are not in selection mode, then the exported own
selection should be empty.
-if (pEditEngine->pImpEditEngine->IsInSelectionMode() ||
mpOtherShell)
+// This is needed always in Online, regardless whether in
"selection mode" (whatever
+// that is) or not, for tdf#125568, but I don't have the clout to
make this completely
+// unconditional also for desktop LO.
+if (comphelper::LibreOfficeKit::isActive() ||
pEditEngine->pImpEditEngine->IsInSelectionMode() || mpOtherShell)
{
std::vector aRectangles;
pRegion->GetRegionRectangles(aRectangles);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar_compact.ui| 220 +-- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 133 - 2 files changed, 327 insertions(+), 26 deletions(-) New commits: commit 517df6f02f396fafa04c00d0b17743c59105bb7b Author: andreas kainz AuthorDate: Tue Jul 30 01:27:18 2019 +0200 Commit: andreas_kainz CommitDate: Tue Jul 30 13:57:25 2019 +0200 NB Extension support for tabbed_compact and groupedbar_compact Change-Id: I00265a60f5a66c044bf2eafb627dd3af1c09e3ca Reviewed-on: https://gerrit.libreoffice.org/76570 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 3ad0789f58c4..4b55ff931b06 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -4,6 +4,30 @@ + +True +False + + +True +False +AddonCommand + + + + +True +False + + + + +True +False +service:com.sun.star.deployment.ui.PackageManagerDialog + + + True False @@ -17383,6 +17407,170 @@ + +True +False + + +True +False +end +center +True + + +True +False +center +True + + +True +False +center +False + + +True +False +service:com.sun.star.deployment.ui.PackageManagerDialog + + +False +True + + + + +False +True +0 + + + + +E_xtension +True +True +False +False +end +center +True +none +True + + +False +True +1 + + + + +False +True +2 + + + + +False +False +end +0 + + + + +True +False +end +5 +5 +vertical + + +False +True +5 +end +1 + + + + +True +False +center +True + + +True +False +center +True + + +True +False +center +True +both-horiz +False + + +True +False +AddonCommand + + +False +True + + + + +False +
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - i18npool/source
i18npool/source/calendar/calendarImpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 913120fe50ee770e60bd82e2e60047242872111a
Author: Lionel Elie Mamane
AuthorDate: Wed Jul 10 10:27:19 2019 +0200
Commit: Tomáš Chvátal
CommitDate: Tue Jul 30 13:56:59 2019 +0200
build failure - disambiguate Calendar return class
Change-Id: I892281f85f6cc9c2de2c341ae63240ae85d302c4
Reviewed-on: https://gerrit.libreoffice.org/76595
Reviewed-by: Tomáš Chvátal
Reviewed-by: Lionel Elie Mamane
Tested-by: Jenkins
diff --git a/i18npool/source/calendar/calendarImpl.cxx
b/i18npool/source/calendar/calendarImpl.cxx
index c9e22f7bc9b7..228bed358b09 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -128,7 +128,7 @@ CalendarImpl::getLoadedCalendar2()
return xCalendar->getLoadedCalendar2();
}
-Calendar SAL_CALL
+::css::i18n::Calendar SAL_CALL
CalendarImpl::getLoadedCalendar()
{
if (!xCalendar.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/options/optinet2.cxx| 190 -
cui/source/options/optinet2.hxx| 55 +-
cui/uiconfig/ui/optsecuritypage.ui | 70 +++--
3 files changed, 127 insertions(+), 188 deletions(-)
New commits:
commit e199385872c011af9accf1f7dce01091ffb1e42a
Author: Caolán McNamara
AuthorDate: Tue Jul 30 09:44:26 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 13:16:22 2019 +0200
weld SvxSecurityTabPage
Change-Id: I4cace9417f1f036921b3e95d946f431ec072ce3a
Reviewed-on: https://gerrit.libreoffice.org/76586
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index a6476b60b950..ce76fc2521b5 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -532,91 +532,68 @@ IMPL_STATIC_LINK(SvxProxyTabPage, LoseFocusHdl_Impl,
weld::Widget&, rControl, vo
/* SvxSecurityTabPage */
/* */
//
-
-SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet&
rSet)
-: SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui",
&rSet)
+SvxSecurityTabPage::SvxSecurityTabPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optsecuritypage.ui", "OptSecurityPage",
&rSet)
, mpSecOptions(new SvtSecurityOptions)
+, m_xSecurityOptionsPB(m_xBuilder->weld_button("options"))
+, m_xSavePasswordsCB(m_xBuilder->weld_check_button("savepassword"))
+, m_xShowConnectionsPB(m_xBuilder->weld_button("connections"))
+, m_xMasterPasswordCB(m_xBuilder->weld_check_button("usemasterpassword"))
+, m_xMasterPasswordFT(m_xBuilder->weld_label("masterpasswordtext"))
+, m_xMasterPasswordPB(m_xBuilder->weld_button("masterpassword"))
+, m_xMacroSecFrame(m_xBuilder->weld_container("macrosecurity"))
+, m_xMacroSecPB(m_xBuilder->weld_button("macro"))
+, m_xCertFrame(m_xBuilder->weld_container("certificatepath"))
+, m_xCertPathPB(m_xBuilder->weld_button("cert"))
+, m_xTSAURLsFrame(m_xBuilder->weld_container("tsaurls"))
+, m_xTSAURLsPB(m_xBuilder->weld_button("tsas"))
+, m_xNoPasswordSaveFT(m_xBuilder->weld_label("nopasswordsave"))
{
-get(m_pSecurityOptionsPB, "options");
-get(m_pSavePasswordsCB, "savepassword");
-
//fdo#65595, we need height-for-width support here, but for now we can
//bodge it
-Size aPrefSize(m_pSavePasswordsCB->get_preferred_size());
-Size
aSize(m_pSavePasswordsCB->CalcMinimumSize(56*approximate_char_width()));
-if (aPrefSize.Width() > aSize.Width())
+Size aPrefSize(m_xSavePasswordsCB->get_preferred_size());
+int nMaxWidth = m_xSavePasswordsCB->get_approximate_digit_width() * 40;
+if (aPrefSize.Width() > nMaxWidth)
{
-m_pSavePasswordsCB->set_width_request(aSize.Width());
-m_pSavePasswordsCB->set_height_request(aSize.Height());
+m_xSavePasswordsCB->set_label_line_wrap(true);
+m_xSavePasswordsCB->set_size_request(nMaxWidth, -1);
}
-get(m_pShowConnectionsPB, "connections");
-get(m_pMasterPasswordCB, "usemasterpassword");
-get(m_pMasterPasswordFT, "masterpasswordtext");
-get(m_pMasterPasswordPB, "masterpassword");
-get(m_pMacroSecFrame, "macrosecurity");
-get(m_pMacroSecPB, "macro");
-get(m_pCertFrame, "certificatepath");
-get(m_pCertPathPB, "cert");
-get(m_pTSAURLsFrame, "tsaurls");
-get(m_pTSAURLsPB, "tsas");
-m_sPasswordStoringDeactivateStr =
get("nopasswordsave")->GetText();
+m_sPasswordStoringDeactivateStr = m_xNoPasswordSaveFT->get_label();
InitControls();
-m_pSecurityOptionsPB->SetClickHdl( LINK( this, SvxSecurityTabPage,
SecurityOptionsHdl ) );
-m_pSavePasswordsCB->SetClickHdl( LINK( this, SvxSecurityTabPage,
SavePasswordHdl ) );
-m_pMasterPasswordPB->SetClickHdl( LINK( this, SvxSecurityTabPage,
MasterPasswordHdl ) );
-m_pMasterPasswordCB->SetClickHdl( LINK( this, SvxSecurityTabPage,
MasterPasswordCBHdl ) );
-m_pShowConnectionsPB->SetClickHdl( LINK( this, SvxSecurityTabPage,
ShowPasswordsHdl ) );
-m_pMacroSecPB->SetClickHdl( LINK( this, SvxSecurityTabPage, MacroSecPBHdl
) );
-m_pCertPathPB->SetClickHdl( LINK( this, SvxSecurityTabPage, CertPathPBHdl
) );
-m_pTSAURLsPB->SetClickHdl( LINK( this, SvxSecurityTabPage, TSAURLsPBHdl )
);
+m_xSecurityOptionsPB->connect_clicked( LINK( this, SvxSecurityTabPage,
SecurityOptionsHdl ) );
+m_xSavePasswordsCB->connect_clicked( LINK( this, SvxSecurityTabPage,
SavePasswordHdl ) );
+m_xMasterPasswordPB->connect_clicked( LINK( this, SvxSecurityTabPage,
MasterPasswordHdl ) );
+m_xMasterPasswordCB->connect_clicked( LINK( this, SvxSecurityTabPage,
MasterPasswordCBHdl ) );
+m_xShow
[Libreoffice-commits] core.git: cui/source cui/uiconfig extras/source solenv/bin
cui/source/options/optinet2.cxx| 282 ++---
cui/source/options/optinet2.hxx| 60 +
cui/uiconfig/ui/optproxypage.ui| 40 ++-
extras/source/glade/libreoffice-catalog.xml.in | 12 -
solenv/bin/native-code.py |1
5 files changed, 166 insertions(+), 229 deletions(-)
New commits:
commit f67188df868d40aa81b58616c3702b9f81904119
Author: Caolán McNamara
AuthorDate: Tue Jul 30 09:15:46 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 11:39:33 2019 +0200
weld SvxProxyTabPage
Change-Id: I34651fc7c56da5205b349a83276d5efa536c4301
Reviewed-on: https://gerrit.libreoffice.org/76582
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index af3c497d44e8..a6476b60b950 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -122,53 +122,17 @@ bool isValidPort(OUString const & value) {
}
-VCL_BUILDER_FACTORY_ARGS(SvxNoSpaceEdit,
WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK)
-
-void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent )
-{
-bool bValid = rKEvent.GetKeyCode().GetCode() != KEY_SPACE;
-if (bValid && bOnlyNumeric)
-{
-const vcl::KeyCode& rKeyCode = rKEvent.GetKeyCode();
-sal_uInt16 nGroup = rKeyCode.GetGroup();
-sal_uInt16 nKey = rKeyCode.GetCode();
-bValid = ( KEYGROUP_NUM == nGroup || KEYGROUP_CURSOR == nGroup ||
- ( KEYGROUP_MISC == nGroup && ( nKey < KEY_ADD || nKey >
KEY_EQUAL ) ) );
-if ( !bValid && ( rKeyCode.IsMod1() && (
- KEY_A == nKey || KEY_C == nKey || KEY_V == nKey || KEY_X == nKey
|| KEY_Z == nKey ) ) )
-// Erase, Copy, Paste, Select All and Undo should work
-bValid = true;
-}
-if (bValid)
-Edit::KeyInput(rKEvent);
-}
-
-void SvxNoSpaceEdit::Modify()
+IMPL_LINK(SvxProxyTabPage, PortChangedHdl, weld::Entry&, rEdit, void)
{
-Edit::Modify();
-
-if ( bOnlyNumeric )
+if (!isValidPort(rEdit.get_text()))
{
-if ( !isValidPort(GetText()) )
-{
-std::unique_ptr
xErrorBox(Application::CreateMessageDialog(GetFrameWeld(),
-
VclMessageType::Warning, VclButtonsType::Ok,
- CuiResId(
RID_SVXSTR_OPT_PROXYPORTS)));
-xErrorBox->run();
-}
+std::unique_ptr
xErrorBox(Application::CreateMessageDialog(GetDialogFrameWeld(),
+
VclMessageType::Warning, VclButtonsType::Ok,
+ CuiResId(
RID_SVXSTR_OPT_PROXYPORTS)));
+xErrorBox->run();
}
}
-bool SvxNoSpaceEdit::set_property(const OString &rKey, const OUString &rValue)
-{
-if (rKey == "only-numeric")
-bOnlyNumeric = toBool(rValue);
-else
-return Edit::set_property(rKey, rValue);
-return true;
-}
-
-
static const char g_aProxyModePN[] = "ooInetProxyType";
static const char g_aHttpProxyPN[] = "ooInetHTTPProxyName";
static const char g_aHttpPortPN[] = "ooInetHTTPProxyPort";
@@ -178,42 +142,64 @@ static const char g_aFtpProxyPN[] = "ooInetFTPProxyName";
static const char g_aFtpPortPN[] = "ooInetFTPProxyPort";
static const char g_aNoProxyDescPN[] = "ooInetNoProxy";
+IMPL_STATIC_LINK(SvxProxyTabPage, NumberOnlyTextFilterHdl, OUString&, rTest,
bool)
+{
+OUStringBuffer sAllowed;
+for (sal_Int32 i = 0, nLen = rTest.getLength(); i < nLen; ++i)
+{
+if (rTest[i] >= '0' && rTest[i] <= '9')
+sAllowed.append(rTest[i]);
+}
+rTest = sAllowed.makeStringAndClear();
+return true;
+}
+
+IMPL_STATIC_LINK(SvxProxyTabPage, NoSpaceTextFilterHdl, OUString&, rTest, bool)
+{
+rTest = rTest.replaceAll(" ", "");
+return true;
+}
+
//
/* */
/* SvxProxyTabPage */
/* */
//
-
-SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
-: SfxTabPage(pParent, "OptProxyPage","cui/ui/optproxypage.ui", &rSet)
+SvxProxyTabPage::SvxProxyTabPage(TabPageParent pParent, const SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optproxypage.ui", "OptProxyPage", &rSet)
+, m_xProxyModeLB(m_xBuilder->weld_combo_box("proxymode"))
+, m_xHttpProxyFT(m_xBuilder->weld_label("httpft"))
+, m_xHttpProxyED(m_xBuilder->weld_entry("http"))
+, m_xHttpPortFT(m_xBuilder->weld_label("httpportft"))
+, m_xHttpPortED(m_xBuilder->weld_entry("httpport"))
+, m_xHttpsProxyFT(m_xBuilder->we
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - editeng/source
editeng/source/editeng/impedit.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 02a3c0e471272b78db17b4e1d10ea349e4bc53da
Author: Tor Lillqvist
AuthorDate: Tue Jul 30 11:48:19 2019 +0300
Commit: Miklos Vajna
CommitDate: Tue Jul 30 11:36:30 2019 +0200
tdf#125568: We need the selection string also when not "in selection mode"
Apparently being "in selection mode" has nothing to do with whether we
have a selection that we are enlarging by dragging the end marker?
Change-Id: I546a1685bd3a0102e16c1f8bc6e721819ed986e2
Reviewed-on: https://gerrit.libreoffice.org/76588
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 8e5c8c71540f..dafbb3939fae 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -411,7 +412,10 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel,
vcl::Region* pRegion,
OString sRectangle;
// If we are not in selection mode, then the exported own
selection should be empty.
-if (pEditEngine->pImpEditEngine->IsInSelectionMode() ||
mpOtherShell)
+// This is needed always in Online, regardless whether in
"selection mode" (whatever
+// that is) or not, for tdf#125568, but I don't have the clout to
make this completely
+// unconditional also for desktop LO.
+if (comphelper::LibreOfficeKit::isActive() ||
pEditEngine->pImpEditEngine->IsInSelectionMode() || mpOtherShell)
{
std::vector aRectangles;
pRegion->GetRegionRectangles(aRectangles);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source sccomp/source scripting/source
scaddins/source/analysis/analysis.cxx | 14
scaddins/source/analysis/analysishelper.cxx | 62 +---
sccomp/source/solver/CoinMPSolver.cxx | 17 ++---
sccomp/source/solver/LpsolveSolver.cxx | 25 +++-
scripting/source/basprov/basmethnode.cxx| 16 +
scripting/source/basprov/basprov.cxx|7 --
scripting/source/dlgprov/dlgevtatt.cxx | 13 +---
scripting/source/protocolhandler/scripthandler.cxx | 19 ++
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 25 +++-
scripting/source/provider/ProviderCache.cxx | 27 +---
scripting/source/provider/ProviderCache.hxx | 14
scripting/source/provider/URIHelper.cxx | 26 +++-
scripting/source/stringresource/stringresource.cxx |5 -
scripting/source/vbaevents/eventhelper.cxx | 22 +--
14 files changed, 107 insertions(+), 185 deletions(-)
New commits:
commit 5ba84c3c7080d55d86b8b39db077b6da36cb700a
Author: Arkadiy Illarionov
AuthorDate: Sat Jul 27 23:20:29 2019 +0300
Commit: Arkadiy Illarionov
CommitDate: Tue Jul 30 11:16:00 2019 +0200
Simplify Sequence iterations in scaddins, sccomp, scripting
Use range-based loops, STL and comphelper functions
Change-Id: I836422a1c81a3dc9585687ed2e506eb59bb4ec91
Reviewed-on: https://gerrit.libreoffice.org/76484
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index 3587d859c2d6..ce3c866aba2b 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -571,19 +571,11 @@ double SAL_CALL AnalysisAddIn::getSeriessum( double fX,
double fN, double fM, co
if( fX != 0.0 )
{
-sal_Int32 n1, n2;
-sal_Int32 nE1 = aCoeffList.getLength();
-sal_Int32 nE2;
-
-for( n1 = 0 ; n1 < nE1 ; n1++ )
+for( const uno::Sequence< double >& rList : aCoeffList )
{
-const uno::Sequence< double >&rList = aCoeffList[ n1 ];
-nE2 = rList.getLength();
-const double* pList = rList.getConstArray();
-
-for( n2 = 0 ; n2 < nE2 ; n2++ )
+for( const double fCoef : rList )
{
-fRet += pList[ n2 ] * pow( fX, fN );
+fRet += fCoef * pow( fX, fN );
fN += fM;
}
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index c44c55f763db..c608732b14d6 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1481,14 +1481,10 @@ void SortedIndividualInt32List::InsertHolidayList(
if( !(rHolAny >>= aAnySeq) )
throw lang::IllegalArgumentException();
-const uno::Sequence< uno::Any >* pSeqArray = aAnySeq.getConstArray();
-for( sal_Int32 nIndex1 = 0; nIndex1 < aAnySeq.getLength(); nIndex1++ )
+for( const uno::Sequence< uno::Any >& rSubSeq : aAnySeq )
{
-const uno::Sequence< uno::Any >& rSubSeq = pSeqArray[ nIndex1 ];
-const uno::Any* pAnyArray = rSubSeq.getConstArray();
-
-for( sal_Int32 nIndex2 = 0; nIndex2 < rSubSeq.getLength();
nIndex2++ )
-InsertHolidayList( rAnyConv, pAnyArray[ nIndex2 ], nNullDate,
false/*bInsertOnWeekend*/ );
+for( const uno::Any& rAny : rSubSeq )
+InsertHolidayList( rAnyConv, rAny, nNullDate,
false/*bInsertOnWeekend*/ );
}
}
else
@@ -1499,13 +1495,10 @@ void SortedIndividualInt32List::InsertHolidayList(
void ScaDoubleList::Append(
const uno::Sequence< uno::Sequence< double > >& rValueSeq )
{
-const uno::Sequence< double >* pSeqArray = rValueSeq.getConstArray();
-for( sal_Int32 nIndex1 = 0; nIndex1 < rValueSeq.getLength(); nIndex1++ )
+for( const uno::Sequence< double >& rSubSeq : rValueSeq )
{
-const uno::Sequence< double >& rSubSeq = pSeqArray[ nIndex1 ];
-const double* pArray = rSubSeq.getConstArray();
-for( sal_Int32 nIndex2 = 0; nIndex2 < rSubSeq.getLength(); nIndex2++ )
-Append( pArray[ nIndex2 ] );
+for( const double fValue : rSubSeq )
+Append( fValue );
}
}
@@ -1513,13 +1506,10 @@ void ScaDoubleList::Append(
void ScaDoubleList::Append(
const uno::Sequence< uno::Sequence< sal_Int32 > >& rValueSeq )
{
-const uno::Sequence< sal_Int32 >* pSeqArray = rValueSeq.getConstArray();
-for( sal_Int32 nIndex1 = 0; nIndex1 < rValueSeq.getLength(); nIndex1++ )
+for( const uno::Sequence< sal_Int32 >& rSubSeq : rValueSeq )
{
-const uno::Sequence< sal_Int32 >& rSubSeq = pSeqArray[ nIndex1 ];
-const sal_Int32* pArray = rSubSeq.getConstArray();
-for( sal_Int32 nIndex2 = 0; nI
[Libreoffice-commits] dev-tools.git: scripts/git-cherry-gerrit
scripts/git-cherry-gerrit | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 2a2a76d9e19bdadf0518e9223244faf0c0e81d6e
Author: Miklos Vajna
AuthorDate: Tue Jul 30 10:28:12 2019 +0200
Commit: Miklos Vajna
CommitDate: Tue Jul 30 10:30:17 2019 +0200
git-cherry-gerrit: add support for an optional whitelist file
So that in case a change-id is missing and it was reviewed once, no need
to do it again all the time.
Change-Id: I29c28b71053b5b0dd4460b3ad66cfcb96936a17c
diff --git a/scripts/git-cherry-gerrit b/scripts/git-cherry-gerrit
index 0505383..8e1d9a1 100755
--- a/scripts/git-cherry-gerrit
+++ b/scripts/git-cherry-gerrit
@@ -13,8 +13,10 @@ cherry_to=${2}
branch_point=${3}
+whitelist_file=${4}
+
if [ -z "$cherry_from" ] ; then
-echo "Usage: git-cherry-gerrit cherry_from cherry_to [branch_point_from]"
+echo "Usage: git-cherry-gerrit cherry_from cherry_to [branch_point_from]
[whitelist_file]"
exit 1;
fi
@@ -37,12 +39,17 @@ do
changeid="$(git cat-file commit $hash |grep Change-Id:)"
if [ -z "$changeid" ]; then
pretty=`git --no-pager log -1
--format='format:%h%x09%an%x09%s%x0a' $hash`
-echo "WARNING: commit '$pretty' has no Change-Id, assuming it has
to be cherry-picked."
+if [ -z "${whitelist_file}" ] || ! grep -q "${pretty}"
"${whitelist_file}"; then
+echo "WARNING: commit '$pretty' has no Change-Id, assuming it
has to be cherry-picked."
+fi
continue
fi
if ! grep -q "$changeid" /tmp/tohashes; then
-git --no-pager log -1 --format='format:%h%x09%an%x09%s%x0a'
$hash
+pretty=`git --no-pager log -1
--format='format:%h%x09%an%x09%s%x0a' $hash`
+if [ -z "${whitelist_file}" ] || ! grep -q "${pretty}"
"${whitelist_file}"; then
+git --no-pager log -1 --format='format:%h%x09%an%x09%s%x0a'
$hash
+fi
fi
done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/layout/layout.cxx | 108 -
1 file changed, 108 deletions(-)
New commits:
commit 850693273970be2662cce8f4d2710b3657a02f65
Author: Michael Stahl
AuthorDate: Mon Jul 29 17:42:18 2019 +0200
Commit: Michael Stahl
CommitDate: Tue Jul 30 10:27:21 2019 +0200
sw_redlinehide: remove obsolete ExperimentalMode in layout test
Change-Id: Ibf2a0ccf80209e81587982d2bac9f83f763a6270
Reviewed-on: https://gerrit.libreoffice.org/76560
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 4ad0651abd90..eec90ca933b8 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -98,18 +98,6 @@ void SwLayoutWriter::CheckRedlineFootnotesHidden()
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFootnotes)
{
-// currently need experimental mode
-Resetter _([]() {
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(false, pBatch);
-return pBatch->commit();
-});
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(true, pBatch);
-pBatch->commit();
-
createDoc("redline_footnotes.odt");
SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
@@ -206,18 +194,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFootnotes)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
{
-// currently need experimental mode
-Resetter _([]() {
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(false, pBatch);
-return pBatch->commit();
-});
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(true, pBatch);
-pBatch->commit();
-
loadURL("private:factory/swriter", nullptr);
SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
@@ -484,18 +460,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader)
{
-// currently need experimental mode
-Resetter _([]() {
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(false, pBatch);
-return pBatch->commit();
-});
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(true, pBatch);
-pBatch->commit();
-
loadURL("private:factory/swriter", nullptr);
SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
@@ -779,18 +743,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInHeader)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInFootnote)
{
-// currently need experimental mode
-Resetter _([]() {
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(false, pBatch);
-return pBatch->commit();
-});
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(true, pBatch);
-pBatch->commit();
-
loadURL("private:factory/swriter", nullptr);
SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
@@ -1169,18 +1121,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInFootnote)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInFlys)
{
-// currently need experimental mode
-Resetter _([]() {
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(false, pBatch);
-return pBatch->commit();
-});
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(true, pBatch);
-pBatch->commit();
-
loadURL("private:factory/swriter", nullptr);
SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
@@ -1645,18 +1585,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInFlys)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysAtFlys)
{
-// currently need experimental mode
-Resetter _([]() {
-std::shared_ptr pBatch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::ExperimentalMode::set(false, pBatch);
-return pBatch->commit();
-});
-std::shared_ptr pBatch(
-comphelper
Weekly Report 9 - Improvement to NotebookBar
Report : * Extension support added for gtkmenu and notebook.ui is modified for writer. * Extension support is almost done , only need some bug fixing. Week tasks * Fix extension support and customization support bugs. *Updating wiki.libreoffice.com blog of extension support. Thanks & Regards Sumit Chauhan IRC nick: sumitcn ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/options/optfltr.cxx | 126 +
cui/source/options/optfltr.hxx | 26 +++-
2 files changed, 67 insertions(+), 85 deletions(-)
New commits:
commit b6b8b4c3d978ffe28e51ccbeef68997b158f894a
Author: Caolán McNamara
AuthorDate: Mon Jul 29 20:59:08 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 09:55:03 2019 +0200
weld OfaMSFilterTabPage
Change-Id: Ie711d8624995027578f79389972c6fa26b3189a2
Reviewed-on: https://gerrit.libreoffice.org/76569
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 764614a6030e..d11c655a472f 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -38,79 +38,63 @@ enum class MSFltrPg2_CheckBoxEntries {
};
-OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet&
rSet)
-: SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", &rSet )
+OfaMSFilterTabPage::OfaMSFilterTabPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optfltrpage.ui", "OptFltrPage", &rSet)
+, m_xWBasicCodeCB(m_xBuilder->weld_check_button("wo_basic"))
+, m_xWBasicWbctblCB(m_xBuilder->weld_check_button("wo_exec"))
+, m_xWBasicStgCB(m_xBuilder->weld_check_button("wo_saveorig"))
+, m_xEBasicCodeCB(m_xBuilder->weld_check_button("ex_basic"))
+, m_xEBasicExectblCB(m_xBuilder->weld_check_button("ex_exec"))
+, m_xEBasicStgCB(m_xBuilder->weld_check_button("ex_saveorig"))
+, m_xPBasicCodeCB(m_xBuilder->weld_check_button("pp_basic"))
+, m_xPBasicStgCB(m_xBuilder->weld_check_button("pp_saveorig"))
{
-get( aWBasicCodeCB , "wo_basic");
-get( aWBasicWbctblCB, "wo_exec" );
-get( aWBasicStgCB , "wo_saveorig" );
-get( aEBasicCodeCB , "ex_basic");
-get( aEBasicExectblCB , "ex_exec" );
-get( aEBasicStgCB , "ex_saveorig" );
-get( aPBasicCodeCB , "pp_basic");
-get( aPBasicStgCB , "pp_saveorig" );
-
-aWBasicCodeCB->SetClickHdl( LINK( this, OfaMSFilterTabPage,
LoadWordBasicCheckHdl_Impl ) );
-aEBasicCodeCB->SetClickHdl( LINK( this, OfaMSFilterTabPage,
LoadExcelBasicCheckHdl_Impl ) );
+m_xWBasicCodeCB->connect_clicked( LINK( this, OfaMSFilterTabPage,
LoadWordBasicCheckHdl_Impl ) );
+m_xEBasicCodeCB->connect_clicked( LINK( this, OfaMSFilterTabPage,
LoadExcelBasicCheckHdl_Impl ) );
}
OfaMSFilterTabPage::~OfaMSFilterTabPage()
{
-disposeOnce();
-}
-
-void OfaMSFilterTabPage::dispose()
-{
-aWBasicCodeCB.clear();
-aWBasicWbctblCB.clear();
-aWBasicStgCB.clear();
-aEBasicCodeCB.clear();
-aEBasicExectblCB.clear();
-aEBasicStgCB.clear();
-aPBasicCodeCB.clear();
-aPBasicStgCB.clear();
-SfxTabPage::dispose();
}
-
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, weld::Button&,
void)
{
-aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() );
+m_xWBasicWbctblCB->set_sensitive(m_xWBasicCodeCB->get_active());
}
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl,
weld::Button&, void)
{
-aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() );
+m_xEBasicExectblCB->set_sensitive(m_xEBasicCodeCB->get_active());
}
VclPtr OfaMSFilterTabPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet )
{
-return VclPtr::Create( pParent.pParent, *rAttrSet );
+return VclPtr::Create(pParent, *rAttrSet);
}
bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
-if( aWBasicCodeCB->IsValueChangedFromSaved() )
-rOpt.SetLoadWordBasicCode( aWBasicCodeCB->IsChecked() );
-if( aWBasicWbctblCB->IsValueChangedFromSaved() )
-rOpt.SetLoadWordBasicExecutable( aWBasicWbctblCB->IsChecked() );
-if( aWBasicStgCB->IsValueChangedFromSaved() )
-rOpt.SetLoadWordBasicStorage( aWBasicStgCB->IsChecked() );
-
-if( aEBasicCodeCB->IsValueChangedFromSaved())
-rOpt.SetLoadExcelBasicCode( aEBasicCodeCB->IsChecked() );
-if( aEBasicExectblCB->IsValueChangedFromSaved())
-rOpt.SetLoadExcelBasicExecutable( aEBasicExectblCB->IsChecked() );
-if( aEBasicStgCB->IsValueChangedFromSaved())
-rOpt.SetLoadExcelBasicStorage( aEBasicStgCB->IsChecked() );
-
-if( aPBasicCodeCB->IsValueChangedFromSaved())
-rOpt.SetLoadPPointBasicCode( aPBasicCodeCB->IsChecked() );
-if( aPBasicStgCB->IsValueChangedFromSaved())
-rOpt.SetLoadPPointBasicStorage( aPBasicStgCB->IsChecked() );
+if( m_xWBasicCodeCB->get_state_changed_from_saved() )
+rOpt.SetLoadWordBasicCode( m_xWBasicCodeCB->get_active() );
+i
[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig extras/source include/sfx2 include/svx sfx2/source solenv/bin svx/source sw/inc sw/source sw/uiconfig
cui/source/options/optinet2.cxx| 73 ++---
cui/source/options/optinet2.hxx| 23 -
cui/source/options/optupdt.cxx | 172 +
cui/source/options/optupdt.hxx | 40 +--
cui/uiconfig/ui/optemailpage.ui| 41 +--
cui/uiconfig/ui/optonlineupdatepage.ui |8
extras/source/glade/libreoffice-catalog.xml.in |3
include/sfx2/dialoghelper.hxx |2
include/svx/fntctrl.hxx|2
sfx2/source/dialog/dialoghelper.cxx|4
solenv/bin/native-code.py |1
svx/source/dialog/fntctrl.cxx | 12
sw/inc/strings.hrc |4
sw/source/ui/config/optpage.cxx| 324 +++--
sw/source/uibase/inc/optpage.hxx | 61 ++--
sw/uiconfig/swriter/ui/optredlinepage.ui | 128 -
16 files changed, 479 insertions(+), 419 deletions(-)
New commits:
commit 6833539b466e21bebb77e247275dc50de1f36c43
Author: Caolán McNamara
AuthorDate: Mon Jul 29 20:47:09 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 09:54:26 2019 +0200
weld SvxOnlineUpdateTabPage
Change-Id: I0043ba0b088f0b9ae8e5716c64e424419993cb96
Reviewed-on: https://gerrit.libreoffice.org/76568
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 63c6a2959189..8477f07fa8f1 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -45,27 +45,28 @@
using namespace ::css;
-SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const
SfxItemSet& rSet)
-: SfxTabPage(pParent, "OptOnlineUpdatePage",
"cui/ui/optonlineupdatepage.ui", &rSet)
+SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optonlineupdatepage.ui",
"OptOnlineUpdatePage", &rSet)
+, m_xNeverChecked(m_xBuilder->weld_label("neverchecked"))
+, m_xAutoCheckCheckBox(m_xBuilder->weld_check_button("autocheck"))
+, m_xEveryDayButton(m_xBuilder->weld_radio_button("everyday"))
+, m_xEveryWeekButton(m_xBuilder->weld_radio_button("everyweek"))
+, m_xEveryMonthButton(m_xBuilder->weld_radio_button("everymonth"))
+, m_xCheckNowButton(m_xBuilder->weld_button("checknow"))
+, m_xAutoDownloadCheckBox(m_xBuilder->weld_check_button("autodownload"))
+, m_xDestPathLabel(m_xBuilder->weld_label("destpathlabel"))
+, m_xDestPath(m_xBuilder->weld_label("destpath"))
+, m_xChangePathButton(m_xBuilder->weld_button("changepath"))
+, m_xLastChecked(m_xBuilder->weld_label("lastchecked"))
+, m_xExtrasCheckBox(m_xBuilder->weld_check_button("extrabits"))
+, m_xUserAgentLabel(m_xBuilder->weld_label("useragent"))
{
-m_aNeverChecked = get("neverchecked")->GetText();
-get(m_pAutoCheckCheckBox, "autocheck");
-get(m_pEveryDayButton, "everyday");
-get(m_pEveryWeekButton, "everyweek");
-get(m_pEveryMonthButton, "everymonth");
-get(m_pCheckNowButton, "checknow");
-get(m_pAutoDownloadCheckBox, "autodownload");
-get(m_pDestPathLabel, "destpathlabel");
-get(m_pDestPath, "destpath");
-get(m_pChangePathButton, "changepath");
-get(m_pLastChecked, "lastchecked");
-get(m_pExtrasCheckBox, "extrabits");
-get(m_pUserAgentLabel, "useragent");
-
-m_pAutoCheckCheckBox->SetClickHdl( LINK( this, SvxOnlineUpdateTabPage,
AutoCheckHdl_Impl ) );
-m_pExtrasCheckBox->SetClickHdl( LINK( this, SvxOnlineUpdateTabPage,
ExtrasCheckHdl_Impl ) );
-m_pCheckNowButton->SetClickHdl( LINK( this, SvxOnlineUpdateTabPage,
CheckNowHdl_Impl ) );
-m_pChangePathButton->SetClickHdl( LINK( this, SvxOnlineUpdateTabPage,
FileDialogHdl_Impl ) );
+m_aNeverChecked = m_xNeverChecked->get_label();
+
+m_xAutoCheckCheckBox->connect_toggled( LINK( this, SvxOnlineUpdateTabPage,
AutoCheckHdl_Impl ) );
+m_xExtrasCheckBox->connect_clicked( LINK( this, SvxOnlineUpdateTabPage,
ExtrasCheckHdl_Impl ) );
+m_xCheckNowButton->connect_clicked( LINK( this, SvxOnlineUpdateTabPage,
CheckNowHdl_Impl ) );
+m_xChangePathButton->connect_clicked( LINK( this, SvxOnlineUpdateTabPage,
FileDialogHdl_Impl ) );
uno::Reference < uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
@@ -75,16 +76,12 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window*
pParent, const SfxIt
bool bDownloadSupported = false;
m_xUpdateAccess->getByName( "DownloadSupported" ) >>= bDownloadSupported;
-WinBits nStyle = m_pDestPath->GetStyle();
-nStyle |= WB_PATHELLIPSIS;
-m_pDestPath->SetStyle(nStyle);
-
-m_pAutoDownloadCheckBox->Show(bDownloadSupported);
-m_pDestPathLabel->Show(bDownloadSupported);
-m_pDestPath->Show(bDownloadSupported);
-m_pChangePathButton->Show(bD
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/options/optctl.cxx | 111 +++-
cui/source/options/optctl.hxx | 22 +--
cui/source/options/optgdlg.cxx | 268 ++---
cui/source/options/optgdlg.hxx | 57
cui/uiconfig/ui/optctlpage.ui |3
cui/uiconfig/ui/optviewpage.ui | 16 --
6 files changed, 208 insertions(+), 269 deletions(-)
New commits:
commit 16073ff56f792144bf262795869f7e5413eca8fc
Author: Caolán McNamara
AuthorDate: Mon Jul 29 20:01:09 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 09:52:54 2019 +0200
weld OfaViewTabPage
Change-Id: I259e10ad8bdf3d1630ab1d24590c43919a351a86
Reviewed-on: https://gerrit.libreoffice.org/76567
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index a1e6e777656c..32802f75a3ed 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -605,8 +605,8 @@ static bool DisplayNameCompareLessThan(const
vcl::IconThemeInfo& rInfo1, const v
return rInfo1.GetDisplayName().compareTo(rInfo2.GetDisplayName()) < 0;
}
-OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
-: SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet)
+OfaViewTabPage::OfaViewTabPage(TabPageParent pParent, const SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optviewpage.ui", "OptViewPage", &rSet)
, nSizeLB_InitialSelection(0)
, nSidebarSizeLB_InitialSelection(0)
, nNotebookbarSizeLB_InitialSelection(0)
@@ -615,50 +615,48 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
, pCanvasSettings(new CanvasSettings)
, mpDrawinglayerOpt(new SvtOptionsDrawinglayer)
, mpOpenGLConfig(new svt::OpenGLCfg)
+, m_xIconSizeLB(m_xBuilder->weld_combo_box("iconsize"))
+, m_xSidebarIconSizeLB(m_xBuilder->weld_combo_box("sidebariconsize"))
+,
m_xNotebookbarIconSizeLB(m_xBuilder->weld_combo_box("notebookbariconsize"))
+, m_xIconStyleLB(m_xBuilder->weld_combo_box("iconstyle"))
+, m_xFontAntiAliasing(m_xBuilder->weld_check_button("aafont"))
+, m_xAAPointLimitLabel(m_xBuilder->weld_label("aafrom"))
+, m_xAAPointLimit(m_xBuilder->weld_metric_spin_button("aanf",
FieldUnit::PIXEL))
+, m_xMenuIconsLB(m_xBuilder->weld_combo_box("menuicons"))
+,
m_xContextMenuShortcutsLB(m_xBuilder->weld_combo_box("contextmenushortcuts"))
+, m_xFontShowCB(m_xBuilder->weld_check_button("showfontpreview"))
+, m_xUseHardwareAccell(m_xBuilder->weld_check_button("useaccel"))
+, m_xUseAntiAliase(m_xBuilder->weld_check_button("useaa"))
+, m_xUseOpenGL(m_xBuilder->weld_check_button("useopengl"))
+, m_xForceOpenGL(m_xBuilder->weld_check_button("forceopengl"))
+, m_xOpenGLStatusEnabled(m_xBuilder->weld_label("openglenabled"))
+, m_xOpenGLStatusDisabled(m_xBuilder->weld_label("opengldisabled"))
+, m_xMousePosLB(m_xBuilder->weld_combo_box("mousepos"))
+, m_xMouseMiddleLB(m_xBuilder->weld_combo_box("mousemiddle"))
{
-get(m_pIconSizeLB, "iconsize");
-get(m_pSidebarIconSizeLB, "sidebariconsize");
-get(m_pNotebookbarIconSizeLB, "notebookbariconsize");
-get(m_pIconStyleLB, "iconstyle");
-
-get(m_pFontAntiAliasing, "aafont");
-get(m_pAAPointLimitLabel, "aafrom");
-get(m_pAAPointLimit, "aanf");
-get(m_pMenuIconsLB, "menuicons");
-get(m_pContextMenuShortcutsLB, "contextmenushortcuts");
-get(m_pFontShowCB, "showfontpreview");
-get(m_pUseHardwareAccell, "useaccel");
-get(m_pUseAntiAliase, "useaa");
-get(m_pUseOpenGL, "useopengl");
-get(m_pForceOpenGL, "forceopengl");
-get(m_pOpenGLStatusEnabled, "openglenabled");
-get(m_pOpenGLStatusDisabled, "opengldisabled");
-get(m_pMousePosLB, "mousepos");
-get(m_pMouseMiddleLB, "mousemiddle");
-
if (Application::GetToolkitName() == "gtk3")
{
-m_pUseOpenGL->Hide();
-m_pForceOpenGL->Hide();
-m_pOpenGLStatusEnabled->Hide();
-m_pOpenGLStatusDisabled->Hide();
+m_xUseOpenGL->hide();
+m_xForceOpenGL->hide();
+m_xOpenGLStatusEnabled->hide();
+m_xOpenGLStatusDisabled->hide();
}
#if defined( UNX )
-m_pFontAntiAliasing->SetToggleHdl( LINK( this, OfaViewTabPage,
OnAntialiasingToggled ) );
+m_xFontAntiAliasing->connect_toggled( LINK( this, OfaViewTabPage,
OnAntialiasingToggled ) );
#else
// on this platform, we do not have the anti aliasing options
-m_pFontAntiAliasing->Hide();
-m_pAAPointLimitLabel->Hide();
-m_pAAPointLimit->Hide();
+m_xFontAntiAliasing->hide();
+m_xAAPointLimitLabel->hide();
+m_xAAPointLimit->hide();
#endif
-m_pForceOpenGL->SetToggleHdl(LINK(this, OfaViewTabPage,
OnForceOpenGLToggled));
+m_xForceOpenGL->connect_toggled(LINK(this, OfaViewTabPage,
OnForceOpenGLToggled));
// Set known icon themes
-OUString sAutoStr( m_pIconStyl
[Libreoffice-commits] core.git: compilerplugins/clang include/IwyuFilter_include.yaml include/vcl solenv/clang-format vcl/inc vcl/opengl vcl/quartz vcl/unx vcl/win vcl/workben
compilerplugins/clang/unusedenumconstants.py |1 include/IwyuFilter_include.yaml |8 - include/vcl/salbtype.hxx | 32 --- solenv/clang-format/blacklist|1 vcl/inc/quartz/salbmp.h |3 +- vcl/opengl/salbmp.cxx|1 vcl/opengl/texture.cxx |1 vcl/opengl/x11/gdiimpl.cxx |1 vcl/quartz/salbmp.cxx|7 - vcl/unx/generic/gdi/gdiimpl.cxx |1 vcl/unx/generic/gdi/openglx11cairotextrender.cxx |1 vcl/unx/generic/gdi/salbmp.cxx |1 vcl/unx/generic/gdi/salgdi2.cxx |1 vcl/unx/gtk/gtksalframe.cxx |1 vcl/unx/gtk3/gtk3gtkframe.cxx|1 vcl/win/gdi/gdiimpl.cxx |4 ++ vcl/win/gdi/salbmp.cxx |6 +++- vcl/win/gdi/salgdi2.cxx |5 ++- vcl/workben/vcldemo.cxx |1 19 files changed, 20 insertions(+), 57 deletions(-) New commits: commit b368329430e73a672fd53d65e962dbac7dee55ae Author: Gabor Kelemen AuthorDate: Sun Jul 28 10:38:15 2019 +0200 Commit: Miklos Vajna CommitDate: Tue Jul 30 09:51:39 2019 +0200 tdf#62699 Drop (now) pass-through header include/vcl/salbtype.hxx Change-Id: I2e2093ac3c8c6833b70d4932bc12a82a4483bde5 Reviewed-on: https://gerrit.libreoffice.org/76499 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py index 591c73f1cede..6d07e20585a0 100755 --- a/compilerplugins/clang/unusedenumconstants.py +++ b/compilerplugins/clang/unusedenumconstants.py @@ -148,7 +148,6 @@ def is_ignore(srcLoc): "vcl/inc/unx/gendata.hxx", "vcl/inc/salwtype.hxx", "include/vcl/svapp.hxx", - "include/vcl/salbtype.hxx", "include/vcl/commandevent.hxx", # CommandEvent, MediaCommand, ShowDialogId "include/canvas/rendering/irendermodule.hxx", # canvas::IRenderModule::PrimitiveType "sal/osl/unx/file.cxx", # FileHandle_Impl::Kind diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 790d2a3e8d03..28de6ac57eb3 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -302,14 +302,6 @@ blacklist: include/vcl/mtfxmldump.hxx: # Full definition needed for o3tl::enumarray - vcl/metaactiontypes.hxx -include/vcl/salbtype.hxx: -# TODO remove this file entirely, contains only these headers now -- vcl/BitmapAccessMode.hxx -- vcl/BitmapBuffer.hxx -- vcl/BitmapColor.hxx -- vcl/BitmapPalette.hxx -- vcl/ColorMask.hxx -- vcl/Scanline.hxx include/vcl/outdevstate.hxx: # Full definition needed for boost::optional - vcl/mapmod.hxx diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx deleted file mode 100644 index 7eabfe7791a8.. --- a/include/vcl/salbtype.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_VCL_SALBTYPE_HXX -#define INCLUDED_VCL_SALBTYPE_HXX - -#include -#include -#include -#include -#include -#include - -#endif // INCLUDED_VCL_SALBTYPE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index ea4921c7c974..0978262baf92 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7908,7 +7908,6 @@ include/vcl/prntypes.hxx include/vcl/ptrstyle.hxx include/vcl/quickselectionengine.hxx include/vcl/region.hxx -include/vcl/salbtype.hxx include/vcl/salctype.hxx include/vcl/salgtype.hxx include/vcl/salnativewidgets.hxx diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index cb4151f73d28..a5e6f510bc5d 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -22,7 +22,8 @@ #include -#in
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/vcl vcl/source
include/vcl/button.hxx|2 +-
vcl/source/control/button.cxx |7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit c27987010c6fd67ae68ddc2a3d316b62bdd81d84
Author: Justin Luth
AuthorDate: Tue Jul 23 13:53:21 2019 +0300
Commit: Miklos Vajna
CommitDate: Tue Jul 30 09:35:37 2019 +0200
tdf#125609 c14: vcl button: don't modify style directly
LO 6.4/6.3 commit d35171456bc230efdaa9426da1398b2db7fa0df8
could cause a recursive loop. ImplInitStyle RETURNS the
suggested style, while ImplUncheckAll MODIFYS the
actual style. Since the call to set WB_TABSTOP
was already redundant in this case (and many others),
I provided an option to avoid that direct modification.
An example crashing document is attached to the bug report,
which will eventually find its way into automatic crash testing.
For this particular example document, it also requires
LO 6.4 commit 5cf057c3365a0feafc8f2e4f4a9e24d69a581999
in order to trigger a crash.
Change-Id: I26dddca27471dec10650f848f787363505b16c0f
Reviewed-on: https://gerrit.libreoffice.org/76186
Reviewed-by: Justin Luth
Tested-by: Justin Luth
(cherry picked from commit a9f4913f283d34c610c4b73c755fdc828857bfce)
Reviewed-on: https://gerrit.libreoffice.org/76574
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 2a63e47a8c9b..4e782aa7a437 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -297,7 +297,7 @@ private:
const Size& rImageSize, tools::Rectangle&
rStateRect,
tools::Rectangle& rMouseRect );
SAL_DLLPRIVATE void ImplDrawRadioButton(vcl::RenderContext&
rRenderContext );
-SAL_DLLPRIVATE void ImplUncheckAllOther();
+SAL_DLLPRIVATE void ImplUncheckAllOther( const bool bSetStyle = true);
SAL_DLLPRIVATE Size ImplGetRadioImageSize() const;
SAL_DLLPRIVATE long ImplGetImageToTextDistance() const;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 1aa58877ad6d..f78fa7d92994 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1864,7 +1864,7 @@ WinBits RadioButton::ImplInitStyle( const vcl::Window*
pPrevWindow, WinBits nSty
}
if ( IsChecked() && IsRadioCheckEnabled() )
-ImplUncheckAllOther();
+ImplUncheckAllOther( /*bSetStyle=*/false );
return nStyle;
}
@@ -2251,9 +2251,10 @@ std::vector< VclPtr >
RadioButton::GetRadioButtonGroup(bool bInclud
return aGroup;
}
-void RadioButton::ImplUncheckAllOther()
+void RadioButton::ImplUncheckAllOther( const bool bSetStyle )
{
-mpWindowImpl->mnStyle |= WB_TABSTOP;
+if ( bSetStyle )
+mpWindowImpl->mnStyle |= WB_TABSTOP;
std::vector > aGroup(GetRadioButtonGroup(false));
// iterate over radio button group and checked buttons
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/loleaflet.css |4
1 file changed, 4 deletions(-)
New commits:
commit 119eb7b86f0471ad42ce1ca9e833b51de44008af
Author: Samuel Mehrbrodt
AuthorDate: Tue Jul 30 09:00:15 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Jul 30 09:27:45 2019 +0200
Remove space below ruler
This breaks cursor positioning with the mouse.
Was introduced with 0576a3cced4c27be940a831d6735ece533a2a47d
Change-Id: I85abca224d2bc9d365443bd87c6793db1900e2a4
Reviewed-on: https://gerrit.libreoffice.org/76578
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 55a64dae3..576931f8d 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -30,10 +30,6 @@
cursor: default;
}
-.hasruler {
- padding-top: 16px;
-}
-
.scroll-container .mCSB_scrollTools.mCSB_1_scrollbar {
position: absolute;
z-index: 1000;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - 2 commits - configure.ac loleaflet/css
configure.ac|2 +-
loleaflet/css/loleaflet.css |4
2 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 441819d4c13ad9fa018a4105b3ab38a18d16488f
Author: Samuel Mehrbrodt
AuthorDate: Tue Jul 30 09:20:29 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Jul 30 09:20:46 2019 +0200
Release 6.2.6
diff --git a/configure.ac b/configure.ac
index 6e4fb5755..5aebd9ba5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [6.2.5.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [6.2.6.0], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit 0d8f08062c0ef1e58f3b19266ae1a5280fd1e5ed
Author: Samuel Mehrbrodt
AuthorDate: Tue Jul 30 09:00:15 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Jul 30 09:02:00 2019 +0200
Remove space below ruler
This breaks cursor positioning with the mouse.
Was introduced with 0576a3cced4c27be940a831d6735ece533a2a47d
Change-Id: I85abca224d2bc9d365443bd87c6793db1900e2a4
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index f345a3cdd..f53adfbbd 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -31,10 +31,6 @@
cursor: default;
}
-.hasruler {
- padding-top: 16px;
-}
-
.scroll-container .mCSB_scrollTools.mCSB_1_scrollbar {
position: absolute;
z-index: 1000;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
