[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/cellfml.hxx |2 -
sw/qa/extras/ooxmlexport/data/tdf118682.fodt |7 -
sw/qa/extras/ooxmlexport/data/tdf133163.fodt | 36 +++
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 14 ++
sw/source/filter/ww8/docxattributeoutput.cxx |4 +--
sw/source/filter/ww8/wrtw8nds.cxx| 14 +-
6 files changed, 66 insertions(+), 11 deletions(-)
New commits:
commit cf596c43315bb96b5e7256a82256f1ccb8c9c4d0
Author: László Németh
AuthorDate: Thu Aug 13 12:05:20 2020 +0200
Commit: László Németh
CommitDate: Fri Aug 14 09:13:03 2020 +0200
tdf#133163 DOCX: export formula cells
as formula fields instead of exporting only cell
text content.
Only unmodified formula fields were exported from
commit d42776e01b87f12fddbcf78101bca1e10a6e4f97
(tdf#118682 DOCX: export formula fields).
Now newly added Writer formula cells or modified
table formula fields imported from DOCX (which are
converted to formula cells after formula editing)
are exported.
Change-Id: Iecec75b2a36b94c2d3aa998603ac10ea2f2b8d4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100667
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 67c2cee65d92..e37b9304bc11 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -119,7 +119,7 @@ public:
SwTableFormula & operator =(SwTableFormula &&) = default;
/// create from the internal formula (for CORE) the external formula (for
UI)
-void PtrToBoxNm( const SwTable* pTable );
+SW_DLLPUBLIC void PtrToBoxNm( const SwTable* pTable );
/// create from the external formula the internal
void BoxNmToPtr( const SwTable* pTable );
/// create from the external/internal formula the relative formula
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118682.fodt
b/sw/qa/extras/ooxmlexport/data/tdf118682.fodt
index 8979d7b2e4d8..b80074592da2 100644
--- a/sw/qa/extras/ooxmlexport/data/tdf118682.fodt
+++ b/sw/qa/extras/ooxmlexport/data/tdf118682.fodt
@@ -8,13 +8,6 @@
-
-
-
-
-
-
-
diff --git a/sw/qa/extras/ooxmlexport/data/tdf133163.fodt
b/sw/qa/extras/ooxmlexport/data/tdf133163.fodt
new file mode 100644
index ..8fdda1cdc556
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf133163.fodt
@@ -0,0 +1,36 @@
+
+http://openoffice.org/2009/office";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:ooow="http://openoffice.org/2004/writer"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ 2
+
+
+
+
+ 3
+
+
+
+
+ 6
+
+
+
+
+
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f65b3afa0a3c..017fa21a6dec 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -996,6 +996,20 @@ DECLARE_OOXMLEXPORT_TEST(testTdf118682, "tdf118682.fodt")
assertXPathContent(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r[2]/w:instrText", " =
SUM(A1:A3)");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf133163, "tdf133163.fodt")
+{
+xmlDocUniquePtr pXmlDoc = parseExport();
+
+// Formula cells were completely missing.
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:p/w:r/w:fldChar", 3);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r/w:fldChar", 3);
+
+// Cell references were parenthesized: + and SUM()
+assertXPathContent(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:p/w:r[2]/w:instrText", " = A1+A2");
+assertXPathContent(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r[2]/w:instrText", " =
SUM(A1:A3)");
+}
+
+
DECLARE_OOXMLEXPORT_TEST(testTdf106953, "tdf106953.docx")
{
uno::Reference xRules = getProperty<
uno::Reference
>(getStyles("NumberingStyles")->getByName("WWNum1"), "NumberingRules");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 09bbad7e6e8b..5b44aec3c2c9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2153,8 +2153,8 @@ void DocxAttributeOutput::CmdField_Impl( const
SwTextNode* pNode, sal_Int32 nPos
UErrorCode nErr(U_ZERO_ERROR);
icu::UnicodeString sInput(sToken.getStr());
// remove < and > around cell references, e.g. to A1,
to A1:B2
- icu::RegexMatcher
xMatch("<([A-Z]{1,3}[0-9]+(:[A-Z]{1,3}[0-9]+)?)>", sInput, 0, nErr);
- sToken = xMatch.replaceAll(icu::UnicodeString("$1"),
nErr).getTerminatedBuffer();
+ icu::RegexMatcher
aMatcher("<([A-Z]{1,3}[0-9]+(:[A-Z]{1,3}[0-9]+)?)>", sInput, 0,
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/app.cxx | 484 +++--
1 file changed, 210 insertions(+), 274 deletions(-)
New commits:
commit 79eb754cbfef5b2a269222501cbc93c0f9e2b767
Author: Noel Grandin
AuthorDate: Wed May 20 15:23:23 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 14 09:26:48 2020 +0200
avoid catch&abort in Desktop::Main
It is better to let the exception be uncaught and then catch that in
the debugger, or let our crashpad handler capture a full
stack-trace and report it.
Change-Id: If5a4259c22c9f47d788e01725c802eeeb46162e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94596
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index ddd4e78e0082..9b9fa3896de5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -342,18 +342,6 @@ OUString MakeStartupErrorMessage(OUString const &
aErrorMessage)
return DpResId(STR_BOOTSTRAP_ERR_CANNOT_START) + "\n" + aErrorMessage;
}
-OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg
)
-{
-OUString aDiagnosticMessage = DpResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS);
-if ( !aInternalErrMsg.isEmpty() )
-{
-aDiagnosticMessage += "\n\n"
- + DpResId(STR_INTERNAL_ERRMSG)
- + aInternalErrMsg;
-}
-return aDiagnosticMessage;
-}
-
// shows a simple error box with the given message ... but exits from these
process !
// Fatal errors can't be solved by the process ... nor any recovery can help.
@@ -1271,248 +1259,235 @@ int Desktop::Main()
Reference< XRestartManager > xRestartManager(
OfficeRestartManager::get(xContext) );
Reference< XDesktop2 > xDesktop;
-try
-{
-RegisterServices(xContext);
-SetSplashScreenProgress(25);
+RegisterServices(xContext);
-#if HAVE_FEATURE_DESKTOP
-// check user installation directory for lockfile so we can be sure
-// there is no other instance using our data files from a remote host
+SetSplashScreenProgress(25);
-bool bMustLockProfile = ( getenv( "SAL_NOLOCK_PROFILE" ) == nullptr );
-if ( bMustLockProfile )
-{
-m_xLockfile.reset(new Lockfile);
+#if HAVE_FEATURE_DESKTOP
+// check user installation directory for lockfile so we can be sure
+// there is no other instance using our data files from a remote host
-if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() &&
- !rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check(
Lockfile_execWarning ))
-{
-// Lockfile exists, and user clicked 'no'
-return EXIT_FAILURE;
-}
-}
+bool bMustLockProfile = ( getenv( "SAL_NOLOCK_PROFILE" ) == nullptr );
+if ( bMustLockProfile )
+{
+m_xLockfile.reset(new Lockfile);
-// check if accessibility is enabled but not working and allow to quit
-if(
Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
+if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() &&
+ !rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check(
Lockfile_execWarning ))
{
-if( !InitAccessBridge() )
-return EXIT_FAILURE;
+// Lockfile exists, and user clicked 'no'
+return EXIT_FAILURE;
}
+}
+
+// check if accessibility is enabled but not working and allow to quit
+if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
+{
+if( !InitAccessBridge() )
+return EXIT_FAILURE;
+}
#endif
-// terminate if requested...
-if( rCmdLineArgs.IsTerminateAfterInit() )
-return EXIT_SUCCESS;
+// terminate if requested...
+if( rCmdLineArgs.IsTerminateAfterInit() )
+return EXIT_SUCCESS;
-// Read the common configuration items for optimization purpose
-if ( !InitializeConfiguration() )
-return EXIT_FAILURE;
+// Read the common configuration items for optimization purpose
+if ( !InitializeConfiguration() )
+return EXIT_FAILURE;
#if HAVE_FEATURE_UPDATE_MAR
-const char* pUpdaterTestEnable =
std::getenv("LIBO_UPDATER_TEST_ENABLE");
-if (pUpdaterTestEnable ||
officecfg::Office::Update::Update::Enabled::get())
+const char* pUpdaterTestEnable = std::getenv("LIBO_UPDATER_TEST_ENABLE");
+if (pUpdaterTestEnable ||
officecfg::Office::Update::Update::Enabled::get())
+{
+// check if we just updated
+const char* pUpdaterRunning = std::getenv("LIBO_UPDATER_TEST_RUNNING");
+bool bUpdateRunning =
officecfg::Office::Update::Update::UpdateRunning::get() || pUpdaterRunning;
+if (bUpdateRunning)
{
-// check if we just updated
-const char* pUpdaterRunning
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/pagecolumncontrol.ui |6 ++ 1 file changed, 6 insertions(+) New commits: commit 1a524be53f62d2509920c2caa80817819f4aa9d9 Author: Rizal Muttaqin AuthorDate: Fri Aug 14 12:40:45 2020 +0700 Commit: Rizal Muttaqin CommitDate: Fri Aug 14 09:27:40 2020 +0200 tdf#135742 icon for More Options in Page Columns Change-Id: I83d78b6a145b68af16375baee688c372700f6b9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100719 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/sw/uiconfig/swriter/ui/pagecolumncontrol.ui b/sw/uiconfig/swriter/ui/pagecolumncontrol.ui index ac9c81c7366d..f0607a7d1bdf 100644 --- a/sw/uiconfig/swriter/ui/pagecolumncontrol.ui +++ b/sw/uiconfig/swriter/ui/pagecolumncontrol.ui @@ -190,6 +190,7 @@ True True True +image_pagecolumntype More Options none True @@ -254,4 +255,9 @@ False sw/res/sidebar/pageproppanel/columnright_24x24.png + +True +False +cmd/lc_pagecolumntype.png + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 2 commits - animations/source include/xmloff offapi/com offapi/UnoApi_offapi.mk slideshow/source xmloff/source
Rebased ref, commits from common ancestor:
commit a6ec5da356aed1c3c53af4bd6fb50b58a42ada9d
Author: Sarper Akdemir
AuthorDate: Fri Aug 14 01:18:14 2020 +0300
Commit: Sarper Akdemir
CommitDate: Fri Aug 14 10:31:12 2020 +0300
wip add bounciness velocity and density options to physics animations
Change-Id: Ifaba785e82c8ee17be00711a3e7a75257e7704ae
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index 88e42772936a..107353cf327a 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -104,6 +105,7 @@ namespace animcore
namespace {
class AnimationNodeBase : public XAnimateMotion,
+public XAnimatePhysics,
public XAnimateColor,
public XTransitionFilter,
public XAnimateSet,
@@ -224,6 +226,16 @@ public:
virtual Any SAL_CALL getOrigin() override;
virtual void SAL_CALL setOrigin( const Any& _origin ) override;
+// XAnimatePhysics
+virtual Any SAL_CALL getStartVelocityX() override;
+virtual void SAL_CALL setStartVelocityX( const Any& _startvelocityx )
override;
+virtual Any SAL_CALL getStartVelocityY() override;
+virtual void SAL_CALL setStartVelocityY( const Any& _startvelocityy )
override;
+virtual Any SAL_CALL getDensity() override;
+virtual void SAL_CALL setDensity( const Any& _density ) override;
+virtual Any SAL_CALL getBounciness() override;
+virtual void SAL_CALL setBounciness( const Any& _bounciness ) override;
+
// XAnimateTransform
virtual sal_Int16 SAL_CALL getTransformType() override;
virtual void SAL_CALL setTransformType( sal_Int16 _transformtype )
override;
@@ -322,6 +334,9 @@ private:
// attributes for XAnimateMotion
Any maPath, maOrigin;
+// attributes for XAnimatePhysics
+Any maStartVelocityX, maStartVelocityY, maDensity, maBounciness;
+
// attributes for XAnimateTransform
sal_Int16 mnTransformType;
@@ -671,8 +686,8 @@ Any SAL_CALL AnimationNode::queryInterface( const Type&
aType )
case AnimationNodeType::ANIMATEPHYSICS:
aRet = ::cppu::queryInterface(
aType,
-static_cast< XAnimate * >( static_cast< XAnimateMotion *
>(this) ),
-static_cast< XAnimateMotion * >( this ) );
+static_cast< XAnimate * >( static_cast< XAnimatePhysics *
>(this) ),
+static_cast< XAnimatePhysics * >( this ) );
break;
case AnimationNodeType::ANIMATECOLOR:
aRet = ::cppu::queryInterface(
@@ -767,7 +782,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType )
throw()
pTypeAr[nPos++] = cppu::UnoType::get();
break;
case AnimationNodeType::ANIMATEPHYSICS:
-pTypeAr[nPos++] = cppu::UnoType::get();
+pTypeAr[nPos++] = cppu::UnoType::get();
break;
case AnimationNodeType::ANIMATECOLOR:
pTypeAr[nPos++] = cppu::UnoType::get();
@@ -1584,6 +1599,72 @@ void SAL_CALL AnimationNode::setOrigin( const Any&
_origin )
fireChangeListener();
}
+// XAnimatePhysics
+Any SAL_CALL AnimationNode::getStartVelocityX()
+{
+Guard< Mutex > aGuard( maMutex );
+return maStartVelocityX;
+}
+
+
+// XAnimatePhysics
+void SAL_CALL AnimationNode::setStartVelocityX( const Any& _startvelocityx )
+{
+Guard< Mutex > aGuard( maMutex );
+maStartVelocityX = _startvelocityx;
+fireChangeListener();
+}
+
+// XAnimatePhysics
+Any SAL_CALL AnimationNode::getStartVelocityY()
+{
+Guard< Mutex > aGuard( maMutex );
+return maStartVelocityY;
+}
+
+
+// XAnimatePhysics
+void SAL_CALL AnimationNode::setStartVelocityY( const Any& _startvelocityy )
+{
+Guard< Mutex > aGuard( maMutex );
+maStartVelocityY = _startvelocityy;
+fireChangeListener();
+}
+
+
+// XAnimatePhysics
+Any SAL_CALL AnimationNode::getDensity()
+{
+Guard< Mutex > aGuard( maMutex );
+return maDensity;
+}
+
+
+// XAnimatePhysics
+void SAL_CALL AnimationNode::setDensity( const Any& _density )
+{
+Guard< Mutex > aGuard( maMutex );
+maDensity = _density;
+fireChangeListener();
+}
+
+
+// XAnimatePhysics
+Any SAL_CALL AnimationNode::getBounciness()
+{
+Guard< Mutex > aGuard( maMutex );
+return maBounciness;
+}
+
+
+// XAnimatePhysics
+void SAL_CALL AnimationNode::setBounciness( const Any& _bounciness )
+{
+Guard< Mutex > aGuard( maMutex );
+maBounciness = _bounciness;
+fireChangeListener();
+}
+
// XAnimateTransform
sal_Int16 SAL_CALL AnimationNode::getTransformType()
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index ffa9206d4f44..13fd270d5fb9 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1445,6 +1445,10 @@ namespace xmloff::token {
XML_PE
[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/inc dbaccess/source editeng/inc editeng/source filter/source include/xmloff linguistic/source reportdesign/inc reportdesign/source sc/inc
compilerplugins/clang/unusedenumconstants.writeonly.results |2 +- dbaccess/inc/pch/precompiled_dbaxml.hxx |2 +- dbaccess/source/filter/xml/xmlExport.cxx|2 +- dbaccess/source/filter/xml/xmlfilter.cxx|2 +- editeng/inc/pch/precompiled_editeng.hxx |2 +- editeng/source/misc/SvXMLAutoCorrectExport.cxx |2 +- filter/source/svg/svgexport.cxx |2 +- filter/source/svg/svgfontexport.cxx |2 +- filter/source/svg/svgwriter.cxx |2 +- include/xmloff/xmlictxt.hxx |2 +- linguistic/source/convdicxml.cxx|2 +- reportdesign/inc/pch/precompiled_rptxml.hxx |2 +- reportdesign/source/filter/xml/xmlExport.cxx|2 +- reportdesign/source/filter/xml/xmlStyleImport.cxx |2 +- reportdesign/source/filter/xml/xmlfilter.cxx|2 +- sc/inc/pch/precompiled_sc.hxx |2 +- sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |2 +- sc/source/filter/xml/XMLColumnRowGroupExport.cxx|2 +- sc/source/filter/xml/XMLExportDataPilot.cxx |2 +- sc/source/filter/xml/XMLExportDatabaseRanges.cxx|2 +- sc/source/filter/xml/XMLStylesExportHelper.cxx |2 +- sc/source/filter/xml/XMLTableHeaderFooterContext.cxx|2 +- sc/source/filter/xml/XMLTableShapeImportHelper.cxx |2 +- sc/source/filter/xml/XMLTrackedChangesContext.cxx |2 +- sc/source/filter/xml/sheetdata.cxx |2 +- sc/source/filter/xml/xmlannoi.cxx |2 +- sc/source/filter/xml/xmlconti.cxx |2 +- sc/source/filter/xml/xmlexprt.cxx |2 +- sc/source/filter/xml/xmlimprt.cxx |2 +- sc/source/filter/xml/xmlstyli.cxx |2 +- solenv/clang-format/excludelist |4 ++-- starmath/source/mathmlexport.cxx|2 +- starmath/source/mathmlimport.cxx|2 +- svx/source/xml/xmlxtexp.cxx |2 +- svx/source/xml/xmlxtimp.cxx |2 +- sw/inc/pch/precompiled_sw.hxx |2 +- sw/source/core/swg/SwXMLBlockExport.cxx |2 +- sw/source/core/swg/SwXMLSectionList.cxx |2 +- sw/source/filter/xml/xmlbrsh.cxx|2 +- sw/source/filter/xml/xmlexp.cxx |2 +- sw/source/filter/xml/xmlexpit.cxx |2 +- sw/source/filter/xml/xmlfmt.cxx |2 +- sw/source/filter/xml/xmlfmte.cxx|2 +- sw/source/filter/xml/xmlimpit.cxx |2 +- sw/source/filter/xml/xmliteme.cxx |2 +- sw/source/filter/xml/xmltble.cxx|2 +- sw/source/filter/xml/xmltbli.cxx|2 +- sw/source/uibase/config/StoredChapterNumbering.cxx |2 +- xmloff/Library_xo.mk|2 +- xmloff/inc/pch/precompiled_xo.hxx |2 +- xmloff/inc/pch/precompiled_xof.hxx |2 +- xmloff/source/chart/PropertyMaps.cxx|2 +- xmloff/source/chart/SchXMLAutoStylePoolP.cxx|2 +- xmloff/source/chart/SchXMLAxisContext.cxx |2 +- xmloff/source/chart/SchXMLCalculationSettingsContext.cxx|2 +- xmloff/source/chart/SchXMLChartContext.cxx |2 +- xmloff/source/chart/SchXMLExport.cxx|2 +- xmloff/source/chart/SchXMLImport.cxx|2 +- xmloff/source/chart/SchXMLLegendContext.cxx |2 +- xmloff/source/chart/SchXMLParagraphContext.cxx |2 +- xmloff/source/chart/SchXMLPlotAreaContext.cxx |2 +- xmloff/source/chart/SchXMLPropertyMappingContext.cxx|2 +- xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx |2 +- xmloff/source/chart/SchXMLSeries2Context.cxx|2 +- xmloff/source/chart/SchXMLTableContext.cxx |2 +- xmloff/source/chart/XMLSymbolImageContext.cxx |2 +- xmloff/source/core/DocumentSettingsContext.cxx
[Libreoffice-commits] core.git: sw/source
sw/source/core/draw/dcontact.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 1668111a2969201d17c75d0e8c7a8e47e0c7d01c
Author: Caolán McNamara
AuthorDate: Thu Aug 13 19:30:48 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 14 12:17:25 2020 +0200
rework this to make it more readable
no logic change intended
Change-Id: I755de2e37bec3843500920476fc23f013103f976
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100685
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 028e6b3df807..5384426f6e61 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1831,14 +1831,20 @@ void SwDrawContact::ConnectToLayout( const
SwFormatAnchor* pAnch )
{
// append drawing object, if
// (1) proposed anchor frame isn't a follow and
+const bool bFollow = pFrame->IsContentFrame() &&
static_cast(pFrame)->IsFollow();
+if (bFollow)
+continue;
+
// (2) drawing object isn't a control object to be anchored
// in header/footer.
-bool bAdd = ( !pFrame->IsContentFrame() ||
-
!static_cast(pFrame)->IsFollow() ) &&
- ( !::CheckControlLayer( GetMaster() ) ||
-!pFrame->FindFooterOrHeader() );
+const bool bControlInHF = ::CheckControlLayer(GetMaster())
&& pFrame->FindFooterOrHeader();
+if (bControlInHF)
+continue;
-if (bAdd && RndStdIds::FLY_AT_FLY != pAnch->GetAnchorId())
+bool bAdd;
+if (RndStdIds::FLY_AT_FLY == pAnch->GetAnchorId())
+bAdd = true;
+else
{
assert(pFrame->IsTextFrame());
bAdd =
IsAnchoredObjShown(*static_cast(pFrame), *pAnch);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - desktop/source
desktop/source/app/app.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 161a72d1bf35413b700bddaf88f1c8b2bc47139b
Author: Noel Grandin
AuthorDate: Fri Aug 14 10:45:19 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 14 13:32:42 2020 +0200
add comments and log some exceptions
Change-Id: I8fab74e92a932fd284a63357e7a20f208af2d20d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100728
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 57f88713cba4..c3baa5392817 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -551,6 +551,7 @@ void Desktop::DeInit()
} catch (const RuntimeException&) {
// someone threw an exception during shutdown
// this will leave some garbage behind...
+TOOLS_WARN_EXCEPTION("desktop.app", "exception throwing during
shutdown, will leave some garbage behind");
}
}
@@ -2295,7 +2296,8 @@ void Desktop::HandleAppEvent( const ApplicationEvent&
rAppEvent )
}
break;
case ApplicationEvent::Type::ShowDialog:
-// ignore all errors here. It's clicking a menu entry only ...
+// This is only used on macOS, and only for About or Preferences.
+// Ignore all errors here. It's clicking a menu entry only ...
// The user will try it again, in case nothing happens .-)
try
{
@@ -2319,7 +2321,9 @@ void Desktop::HandleAppEvent( const ApplicationEvent&
rAppEvent )
}
}
catch(const css::uno::Exception&)
-{}
+{
+TOOLS_WARN_EXCEPTION("desktop.app", "exception thrown by dialog");
+}
break;
case ApplicationEvent::Type::Unaccept:
// try to remove corresponding acceptor
commit 27d9aa3eff7e26c21218bece0310705a0453553f
Author: Noel Grandin
AuthorDate: Fri Aug 14 10:59:32 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 14 13:32:36 2020 +0200
dont catch&abort Desktop::OpenClients_Impl
rather just let the debugger or crashpad handle it
Change-Id: I44e0dd06f2c84a7bf0099093a53032d759c18dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100729
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9b9fa3896de5..57f88713cba4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1150,7 +1150,7 @@ void Desktop::Exception(ExceptionCategory nCategory)
{
case ExceptionCategory::ResourceNotLoaded:
{
-Application::Abort( OUString() );
+Application::Abort( "OS threw signal
OSL_SIGNAL_USER_RESOURCEFAILURE" );
break;
}
@@ -1841,7 +1841,6 @@ class ExitTimer : public Timer
IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void)
{
-try {
// #i114963#
// Enable IPC thread before OpenClients
//
@@ -1869,9 +1868,6 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void)
const char *pExitPostStartup = getenv ("OOO_EXIT_POST_STARTUP");
if (pExitPostStartup && *pExitPostStartup)
new ExitTimer();
-} catch (const css::uno::Exception &e) {
-Application::Abort( "UNO exception during client open: " + e.Message );
-}
}
void Desktop::OpenClients()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.LokDialog.js | 14 ++
loleaflet/src/control/Toolbar.js | 10 +++---
2 files changed, 17 insertions(+), 7 deletions(-)
New commits:
commit c93a1caf3d8afd5d158bf6a71515e119fee47088
Author: Szymon Kłos
AuthorDate: Wed Aug 12 15:49:43 2020 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 13:48:22 2020 +0200
Make dialogs modal, block sidebar actions when opened
This change prevents user from creating multiple instances
of dialogs eg. by using sidebar. Dialogs are modal now.
Child dialogs still can be created from existing dialog and used.
Change-Id: I388006d8857d0196d2884598e150f7bf5948ed47
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100598
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index b69c0e446..57b5fdc95 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -144,6 +144,14 @@ L.Control.LokDialog = L.Control.extend({
return Object.keys(this._dialogs).length > nonDialogEntries;
},
+ // method used to warn user about dialog modality
+ blinkOpenDialog: function() {
+ $('.lokdialog_container').addClass('lokblink');
+ setTimeout(function () {
+ $('.lokdialog_container').removeClass('lokblink');
+ }, 600);
+ },
+
_docLoaded: function(e) {
if (!e.status) {
$('.lokdialog_container').remove();
@@ -1159,6 +1167,12 @@ L.Control.LokDialog = L.Control.extend({
L.DomEvent.on(canvas, 'mousedown mouseup', function(e) {
L.DomEvent.stop(e);
+
+ if ((this._isSidebar(id) || this.isCalcInputBar(id)) &&
this.hasOpenedDialog()) {
+ this.blinkOpenDialog();
+ return;
+ }
+
if (this._isSelectionHandleDragged() && e.type ===
'mouseup') {
this._onSelectionHandleDrag(e);
return;
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 4bf98dc0e..e873cf2b1 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -170,13 +170,9 @@ L.Map.include({
sendUnoCommand: function (command, json) {
var isAllowedInReadOnly = command == '.uno:WordCountDialog';
- var hasOpenedDialog = this.dialog.hasOpenedDialog();
- if (hasOpenedDialog) {
- $('.lokdialog_container').addClass('lokblink');
- setTimeout(function () {
-
$('.lokdialog_container').removeClass('lokblink');
- }, 600);
- } else if (this.isPermissionEdit() || isAllowedInReadOnly) {
+ if (this.dialog.hasOpenedDialog())
+ this.dialog.blinkOpenDialog();
+ else if (this.isPermissionEdit() || isAllowedInReadOnly) {
if (!this.messageNeedsToBeRedirected(command))
this._socket.sendMessage('uno ' + command +
(json ? ' ' + JSON.stringify(json) : ''));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/edtwin.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 93e55876615bcf6eef3b11a7741cf47caa322101
Author: Noel Grandin
AuthorDate: Fri Aug 14 10:02:41 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 14 13:52:56 2020 +0200
improve dodgy code
adding together constants like this is not safe
Change-Id: I6c92b591e623fed9adcf76c08fcd1fb136f8d423
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100724
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 49d759d89aaa..f35cf8705d21 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4285,9 +4285,10 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
else
{
if( !rMEvt.IsSynthetic() &&
-!(( MOUSE_LEFT + KEY_MOD1 ==
-rMEvt.GetModifier() + rMEvt.GetButtons() ) &&
-rSh.Is_FnDragEQBeginDrag() && !rSh.IsAddMode() ))
+!( MOUSE_LEFT == rMEvt.GetButtons() &&
+ KEY_MOD1 == rMEvt.GetModifier() &&
+ rSh.Is_FnDragEQBeginDrag() &&
+ !rSh.IsAddMode() ) )
{
rSh.Drag( &aDocPt, false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/layer/marker/Annotation.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit c0851b0c46676be86017bc3f14f6b212d999421e
Author: Szymon Kłos
AuthorDate: Thu Aug 13 09:41:05 2020 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 13:53:17 2020 +0200
When avatar fails to load use generic image
Change-Id: I03659a75ed168b15483ef46677eae4989b734933
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100643
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/src/layer/marker/Annotation.js
b/loleaflet/src/layer/marker/Annotation.js
index 05c9b59a2..2d1986ef6 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -207,6 +207,7 @@ L.Annotation = L.Layer.extend({
imgAuthor.setAttribute('src', L.LOUtil.getImageURL('user.svg'));
imgAuthor.setAttribute('width', this.options.imgSize.x);
imgAuthor.setAttribute('height', this.options.imgSize.y);
+ imgAuthor.onerror = function () { imgAuthor.setAttribute('src',
L.LOUtil.getImageURL('user.svg')); };
this._authorAvatarImg = imgAuthor;
this._authorAvatartdImg = tdImg;
this._contentAuthor = L.DomUtil.create(tagDiv,
'loleaflet-annotation-content-author', tdAuthor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source dbaccess/inc dbaccess/source editeng/source filter/source include/xmloff linguistic/source reportdesign/inc reportdesign/source sc/inc sc/source solenv/cl
chart2/source/model/filter/XMLFilter.cxx|2 +- dbaccess/inc/pch/precompiled_dbaxml.hxx |2 +- dbaccess/source/filter/xml/xmlComponent.cxx |2 +- dbaccess/source/filter/xml/xmlConnectionResource.cxx|2 +- dbaccess/source/filter/xml/xmlExport.cxx|2 +- dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx |2 +- dbaccess/source/filter/xml/xmlHelper.cxx|2 +- dbaccess/source/filter/xml/xmlTableFilterList.cxx |2 +- dbaccess/source/filter/xml/xmlfilter.cxx|2 +- editeng/source/misc/SvXMLAutoCorrectExport.cxx |2 +- editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx|2 +- editeng/source/xml/xmltxtimp.cxx|2 +- filter/source/svg/svgexport.cxx |2 +- include/xmloff/numehelp.hxx |2 +- linguistic/source/convdicxml.cxx|2 +- linguistic/source/convdicxml.hxx|2 +- reportdesign/inc/pch/precompiled_rptxml.hxx |2 +- reportdesign/source/filter/xml/xmlCell.cxx |2 +- reportdesign/source/filter/xml/xmlColumn.cxx|2 +- reportdesign/source/filter/xml/xmlComponent.cxx |2 +- reportdesign/source/filter/xml/xmlCondPrtExpr.cxx |2 +- reportdesign/source/filter/xml/xmlControlProperty.cxx |2 +- reportdesign/source/filter/xml/xmlExport.cxx|2 +- reportdesign/source/filter/xml/xmlFixedContent.cxx |2 +- reportdesign/source/filter/xml/xmlFormatCondition.cxx |2 +- reportdesign/source/filter/xml/xmlFormattedField.cxx|2 +- reportdesign/source/filter/xml/xmlFunction.cxx |2 +- reportdesign/source/filter/xml/xmlGroup.cxx |2 +- reportdesign/source/filter/xml/xmlHelper.cxx|2 +- reportdesign/source/filter/xml/xmlImage.cxx |2 +- reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx |2 +- reportdesign/source/filter/xml/xmlMasterFields.cxx |2 +- reportdesign/source/filter/xml/xmlReport.cxx|2 +- reportdesign/source/filter/xml/xmlReportElement.cxx |2 +- reportdesign/source/filter/xml/xmlReportElementBase.cxx |2 +- reportdesign/source/filter/xml/xmlSection.cxx |2 +- reportdesign/source/filter/xml/xmlSubDocument.cxx |2 +- reportdesign/source/filter/xml/xmlTable.cxx |2 +- reportdesign/source/filter/xml/xmlfilter.cxx|2 +- sc/inc/pch/precompiled_sc.hxx |2 +- sc/source/filter/xml/XMLCalculationSettingsContext.cxx |2 +- sc/source/filter/xml/XMLCellRangeSourceContext.cxx |2 +- sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |2 +- sc/source/filter/xml/XMLColumnRowGroupExport.cxx|2 +- sc/source/filter/xml/XMLConsolidationContext.cxx|2 +- sc/source/filter/xml/XMLDDELinksContext.cxx |2 +- sc/source/filter/xml/XMLDetectiveContext.cxx|2 +- sc/source/filter/xml/XMLExportDDELinks.cxx |2 +- sc/source/filter/xml/XMLExportDataPilot.cxx |2 +- sc/source/filter/xml/XMLExportDatabaseRanges.cxx|2 +- sc/source/filter/xml/XMLStylesExportHelper.cxx |2 +- sc/source/filter/xml/XMLTableHeaderFooterContext.cxx|2 +- sc/source/filter/xml/XMLTableMasterPageExport.cxx |2 +- sc/source/filter/xml/XMLTableShapeImportHelper.cxx |2 +- sc/source/filter/xml/XMLTableSourceContext.cxx |2 +- sc/source/filter/xml/XMLTrackedChangesContext.cxx |2 +- sc/source/filter/xml/celltextparacontext.cxx|2 +- sc/source/filter/xml/datastreamimport.cxx |2 +- sc/source/filter/xml/editattributemap.cxx |2 +- sc/source/filter/xml/xmlannoi.cxx |2 +- sc/source/filter/xml/xmlbodyi.cxx |2 +- sc/source/filter/xml/xmlcelli.cxx |2 +- sc/source/filter/xml/xmlcoli.cxx|2 +- sc/source/filter/xml/xmlcondformat.cxx |2 +- sc/source/filter/xml/xmlconti.cxx |2 +- sc/source/filter/xml/xmlcvali.cxx |2 +- sc/source/filter/xml/xmldpimp.cxx
[Libreoffice-commits] online.git: cypress_test/integration_tests
cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js |5 +
1 file changed, 5 insertions(+)
New commits:
commit 0139a7c2f468bbd21955a3adf0131706d10300ce
Author: Tamás Zolnai
AuthorDate: Fri Aug 14 13:54:12 2020 +0200
Commit: Tamás Zolnai
CommitDate: Fri Aug 14 14:31:12 2020 +0200
cypress: improve selectAllMobile() method.
A bug occures when we remove a column selcetion.
The document freezes for seconds before it is
updated. Let's workaround it in cypress tests,
until it's fixed.
Change-Id: I5436c969655260d377d4ce47c86270ef15a15c2f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100740
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
index fb1c8ef5c..70b4f1e67 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
@@ -25,6 +25,11 @@ function selectAllMobile(removeSelection = true) {
var yPos = corner.height() - 10;
cy.get('#spreadsheet-header-corner')
.click(0, yPos);
+ // A known issue that removing a column selection
+ // triggers a small freeze of the document.
+ // So let's wait here to avoit timeout.
+ if (removeSelection)
+ cy.wait(3000);
});
cy.get('.spreadsheet-cell-resize-marker')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-them
icon-themes/breeze/cmd/32/orientation.png |binary icon-themes/breeze/cmd/lc_orientation.png |binary icon-themes/breeze/cmd/sc_orientation.png |binary icon-themes/breeze_dark/cmd/32/orientation.png |binary icon-themes/breeze_dark/cmd/lc_orientation.png |binary icon-themes/breeze_dark/cmd/sc_orientation.png |binary icon-themes/breeze_dark_svg/cmd/32/orientation.svg |2 +- icon-themes/breeze_dark_svg/cmd/lc_orientation.svg |2 +- icon-themes/breeze_dark_svg/cmd/sc_orientation.svg |3 ++- icon-themes/breeze_svg/cmd/32/orientation.svg |2 +- icon-themes/breeze_svg/cmd/lc_orientation.svg |2 +- icon-themes/breeze_svg/cmd/sc_orientation.svg |3 ++- icon-themes/sifr/cmd/32/orientation.png|binary icon-themes/sifr/cmd/lc_orientation.png|binary icon-themes/sifr/cmd/sc_orientation.png|binary icon-themes/sifr_dark/cmd/32/orientation.png |binary icon-themes/sifr_dark/cmd/lc_orientation.png |binary icon-themes/sifr_dark/cmd/sc_orientation.png |binary icon-themes/sifr_dark_svg/cmd/32/orientation.svg |2 +- icon-themes/sifr_dark_svg/cmd/lc_orientation.svg |2 +- icon-themes/sifr_dark_svg/cmd/sc_orientation.svg |2 +- icon-themes/sifr_svg/cmd/32/orientation.svg|2 +- icon-themes/sifr_svg/cmd/lc_orientation.svg|2 +- icon-themes/sifr_svg/cmd/sc_orientation.svg|2 +- 24 files changed, 14 insertions(+), 12 deletions(-) New commits: commit fa575be1e59b333a9aadcf4161686dfae2faa555 Author: Rizal Muttaqin AuthorDate: Fri Aug 14 14:36:10 2020 +0700 Commit: Rizal Muttaqin CommitDate: Fri Aug 14 14:39:50 2020 +0200 Breeze & Sifr tdf#131456 ^ Orientation icons Change-Id: I61beac52faea227e98a09d97cf222968348bf542 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100723 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/breeze/cmd/32/orientation.png b/icon-themes/breeze/cmd/32/orientation.png index 112feaea7f9b..3f76996d8072 100644 Binary files a/icon-themes/breeze/cmd/32/orientation.png and b/icon-themes/breeze/cmd/32/orientation.png differ diff --git a/icon-themes/breeze/cmd/lc_orientation.png b/icon-themes/breeze/cmd/lc_orientation.png index 7827668b2453..61ca37e48b8d 100644 Binary files a/icon-themes/breeze/cmd/lc_orientation.png and b/icon-themes/breeze/cmd/lc_orientation.png differ diff --git a/icon-themes/breeze/cmd/sc_orientation.png b/icon-themes/breeze/cmd/sc_orientation.png index c05c32f25798..183e205830ee 100644 Binary files a/icon-themes/breeze/cmd/sc_orientation.png and b/icon-themes/breeze/cmd/sc_orientation.png differ diff --git a/icon-themes/breeze_dark/cmd/32/orientation.png b/icon-themes/breeze_dark/cmd/32/orientation.png index de806e14f828..55659d77f5fe 100644 Binary files a/icon-themes/breeze_dark/cmd/32/orientation.png and b/icon-themes/breeze_dark/cmd/32/orientation.png differ diff --git a/icon-themes/breeze_dark/cmd/lc_orientation.png b/icon-themes/breeze_dark/cmd/lc_orientation.png index 981ecd3ca7ac..aa3d8185c08a 100644 Binary files a/icon-themes/breeze_dark/cmd/lc_orientation.png and b/icon-themes/breeze_dark/cmd/lc_orientation.png differ diff --git a/icon-themes/breeze_dark/cmd/sc_orientation.png b/icon-themes/breeze_dark/cmd/sc_orientation.png index 32a58f69585b..583885daf4c5 100644 Binary files a/icon-themes/breeze_dark/cmd/sc_orientation.png and b/icon-themes/breeze_dark/cmd/sc_orientation.png differ diff --git a/icon-themes/breeze_dark_svg/cmd/32/orientation.svg b/icon-themes/breeze_dark_svg/cmd/32/orientation.svg index 81a5ec8e18a3..fc2df52e82ec 100644 --- a/icon-themes/breeze_dark_svg/cmd/32/orientation.svg +++ b/icon-themes/breeze_dark_svg/cmd/32/orientation.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/cmd/lc_orientation.svg b/icon-themes/breeze_dark_svg/cmd/lc_orientation.svg index 1d2f28c975a3..69d90156fa03 100644 --- a/icon-themes/breeze_dark_svg/cmd/lc_orientation.svg +++ b/icon-themes/breeze_dark_svg/cmd/lc_orientation.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/cmd/sc_orientation.svg b/icon-themes/breeze_dark_svg/cmd/sc_orientation.svg index 42b445ebee70..cdccc79b3450 100644 --- a/icon-themes/breeze_dark_svg/cmd/sc_orientation.svg +++ b/icon-themes/breeze_dark_svg/cmd/sc_orientation.svg @@ -1 +1,2 @@ -http://www.w3.org/2000/svg";>/> \ No newline at end of file +http://www.w3.org/2000/svg";> +/> \ No newline at end of file diff --git a/icon-themes/breeze_svg/cmd/32/orientation.svg b/icon-themes/breeze_svg/cmd/32/orientation.svg index d128d60d9dd0..4be08f84535d 100644 --- a/icon-themes/breeze_svg/cmd/32/orientation.svg +++ b/icon-themes/breeze_svg/cmd/32/orientation.
[Libreoffice-commits] core.git: extensions/source vcl/source
extensions/source/propctrlr/standardcontrol.cxx |8 ++--
vcl/source/window/builder.cxx |7 ++-
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 97e49876086bbdcb58ae0c22d9145c453f239468
Author: Caolán McNamara
AuthorDate: Fri Aug 14 10:29:30 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 14 15:28:44 2020 +0200
tdf#135526 ranges overflowing to become negative
the properties panel uses huge min/maxes which can overflow
when the number of digits changes
Change-Id: Idbb998a065ce8f2b918fceea2076b794cbde3368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100731
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/extensions/source/propctrlr/standardcontrol.cxx
b/extensions/source/propctrlr/standardcontrol.cxx
index 2084a9dae6bf..436f5b412e27 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -331,9 +331,13 @@ namespace pcr
return getTypedControlWindow()->get_digits();
}
-void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16
_decimaldigits )
+void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 decimaldigits
)
{
-getTypedControlWindow()->set_digits( _decimaldigits );
+weld::MetricSpinButton* pControlWindow = getTypedControlWindow();
+int min, max;
+pControlWindow->get_range(min, max, FieldUnit::NONE);
+pControlWindow->set_digits(decimaldigits);
+pControlWindow->set_range(min, max, FieldUnit::NONE);
}
Optional< double > SAL_CALL ONumericControl::getMinValue()
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b7e77efb7c17..b0cb0e053fce 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -342,7 +342,12 @@ namespace weld
int MetricSpinButton::ConvertValue(int nValue, FieldUnit eInUnit,
FieldUnit eOutUnit) const
{
-return vcl::ConvertValue(nValue, 0, m_xSpinButton->get_digits(),
eInUnit, eOutUnit);
+auto nRet = vcl::ConvertValue(nValue, 0, m_xSpinButton->get_digits(),
eInUnit, eOutUnit);
+if (nRet > SAL_MAX_INT32)
+nRet = SAL_MAX_INT32;
+else if (nRet < SAL_MIN_INT32)
+nRet = SAL_MIN_INT32;
+return nRet;
}
IMPL_LINK(MetricSpinButton, spin_button_input, int*, result, bool)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/modeltoviewhelper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 84dd33d8f59dfb69505538e7615907d152f3ac9c
Author: Noel Grandin
AuthorDate: Fri Aug 14 13:54:37 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 14 15:30:35 2020 +0200
can use sorted_vector here
Change-Id: I5f6c1fe7de1dcd409f484a755b8e1313acc8f0c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100741
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx
b/sw/source/core/txtnode/modeltoviewhelper.cxx
index b0ba367faa25..7a6d936b31d5 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -31,7 +31,7 @@
#include
#include
#include
-#include
+#include
#include
namespace {
@@ -64,7 +64,7 @@ struct block
sal_Int32 m_nStart;
sal_Int32 m_nLen;
bool m_bVisible;
-std::set m_aAttrs;
+o3tl::sorted_vector m_aAttrs;
block(sal_Int32 nStart, sal_Int32 nLen, bool bVisible)
: m_nStart(nStart), m_nLen(nLen), m_bVisible(bVisible)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source
vcl/source/outdev/polygon.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 76b93688505c0ab2b0e1876d5461a36d8ea22414
Author: Mike Kaganski
AuthorDate: Fri Aug 14 02:01:05 2020 +0300
Commit: Caolán McNamara
CommitDate: Fri Aug 14 15:30:42 2020 +0200
tdf#134968: don't forget to draw on mpAlphaVDev in fallback case
Change-Id: I6ab8cc8907943c3bb7fd717624ea4ac7c9d4fd5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100711
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 18fd4437077f1e51ae54cfd1a160866cca015c2d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100692
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 77e0564ba16f..e031fb05990c 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -290,6 +290,8 @@ void
OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
if( mbInitFillColor )
InitFillColor();
+bool bSuccess(false);
+
if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) &&
RasterOp::OverPaint == GetRasterOp() &&
@@ -297,7 +299,7 @@ void
OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
{
const basegfx::B2DHomMatrix aTransform(ImplGetDeviceTransformation());
basegfx::B2DPolyPolygon aB2DPolyPolygon(rB2DPolyPoly);
-bool bSuccess(true);
+bSuccess = true;
// ensure closed - maybe assert, hinders buffering
if(!aB2DPolyPolygon.isClosed())
@@ -335,20 +337,18 @@ void
OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
break;
}
}
+}
-if(bSuccess)
-{
-if (mpAlphaVDev)
-
mpAlphaVDev->ImplDrawPolyPolygonWithB2DPolyPolygon(rB2DPolyPoly);
-
-return;
-}
+if (!bSuccess)
+{
+// fallback to old polygon drawing if needed
+const tools::PolyPolygon aToolsPolyPolygon(rB2DPolyPoly);
+const tools::PolyPolygon aPixelPolyPolygon =
ImplLogicToDevicePixel(aToolsPolyPolygon);
+ImplDrawPolyPolygon(aPixelPolyPolygon.Count(), aPixelPolyPolygon);
}
-// fallback to old polygon drawing if needed
-const tools::PolyPolygon aToolsPolyPolygon( rB2DPolyPoly );
-const tools::PolyPolygon aPixelPolyPolygon = ImplLogicToDevicePixel(
aToolsPolyPolygon );
-ImplDrawPolyPolygon( aPixelPolyPolygon.Count(), aPixelPolyPolygon );
+if (mpAlphaVDev)
+mpAlphaVDev->ImplDrawPolyPolygonWithB2DPolyPolygon(rB2DPolyPoly);
}
// #100127# Extracted from OutputDevice::DrawPolyPolygon()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source sc/inc sc/source svx/source sw/source vcl/inc vcl/source
forms/source/component/clickableimage.hxx|5 +
sc/inc/chart2uno.hxx |4 ++--
sc/source/filter/inc/externallinkbuffer.hxx |4 +---
sc/source/filter/oox/condformatbuffer.cxx|3 +--
svx/source/inc/formcontroller.hxx|4 ++--
sw/source/core/txtnode/modeltoviewhelper.cxx |4 +---
sw/source/filter/html/htmltab.cxx| 13 -
vcl/inc/impfontcache.hxx |2 --
vcl/source/font/fontcache.cxx|4 ++--
9 files changed, 14 insertions(+), 29 deletions(-)
New commits:
commit 9a2c347e76c330b45504c8219510c9ef86503b86
Author: Noel Grandin
AuthorDate: Fri Aug 14 12:05:31 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Aug 14 15:30:14 2020 +0200
inline some use-once typedefs
Change-Id: Ifefdb1ad20d09e257064171e458b2eb33065f5de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100733
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/forms/source/component/clickableimage.hxx
b/forms/source/component/clickableimage.hxx
index ad823c4209ac..329f2d5ab430 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -154,12 +154,9 @@ namespace frm
class ImageModelMethodGuard : public ::osl::MutexGuard
{
-private:
-typedef ::osl::MutexGuard GuardBase;
-
public:
explicit ImageModelMethodGuard( OClickableImageBaseModel& _rModel )
-:GuardBase( _rModel.getMutex(
OClickableImageBaseModel::GuardAccess() ) )
+: ::osl::MutexGuard( _rModel.getMutex(
OClickableImageBaseModel::GuardAccess() ) )
{
if ( nullptr == _rModel.getImageProducer(
OClickableImageBaseModel::GuardAccess() ) )
throw css::lang::DisposedException(
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index fee5e2b211ce..5f63433feef3 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -367,13 +367,13 @@ private:
// internals
typedef std::unique_ptr > RangeIndexMapPtr;
-typedef std::unique_ptr ExtRefListenerPtr;
sal_Int64 m_nObjectId;
ScDocument* m_pDocument;
std::vector m_aTokens;
RangeIndexMapPtrm_pRangeIndices;
-ExtRefListenerPtr m_pExtRefListener;
+std::unique_ptr
+m_pExtRefListener;
SfxItemPropertySet m_aPropSet;
std::unique_ptr m_pHiddenListener;
diff --git a/sc/source/filter/inc/externallinkbuffer.hxx
b/sc/source/filter/inc/externallinkbuffer.hxx
index 6e2a528698dc..ce036b04b49b 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -268,8 +268,6 @@ private:
ExternalNameRef createExternalName();
private:
-typedef RefVector< ExternalName > ExternalNameVector;
-
ExternalLinkTypemeLinkType; /// Type of this link object.
FunctionLibraryType meFuncLibType; /// Type of the function library,
if link type is ExternalLinkType::Library.
OUStringmaRelId;/// Relation identifier for the
external link fragment.
@@ -278,7 +276,7 @@ private:
css::uno::Reference< css::sheet::XExternalDocLink >
mxDocLink; /// Interface for an external
document.
std::vector< sal_Int32 > maSheetCaches; /// External sheet cache indexes.
-ExternalNameVector maExtNames; /// Defined names in external
document.
+RefVector< ExternalName > maExtNames; /// Defined names in
external document.
};
typedef std::shared_ptr< ExternalLink > ExternalLinkRef;
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 76369bccbeb0..cca1064223d6 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1123,7 +1123,6 @@ void CondFormatBuffer::finalizeImport()
{
std::unordered_set aDoneExtCFs;
typedef std::unordered_map
RangeMap;
-typedef std::vector> FormatEntries;
RangeMap aRangeMap;
for (auto& rxCondFormat : maCondFormats)
{
@@ -1141,7 +1140,7 @@ void CondFormatBuffer::finalizeImport()
if (it != aRangeMap.end())
{
CondFormat& rCondFormat = *it->second;
-const FormatEntries& rEntries = rxExtCondFormat->getEntries();
+const std::vector>& rEntries =
rxExtCondFormat->getEntries();
const std::vector& rPriorities =
rxExtCondFormat->getPriorities();
size_t nEntryIdx = 0;
for (const auto& rxEntry : rEntries)
diff --git a/svx/source/inc/formcontroller.hxx
b/svx/source/inc/formcontroller.hxx
index 80538a8393d5..065852fe9c3a 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -79,7 +79,6 @@ struct FmXTextComponentLess
typedef ::std::map< css::uno::Reference< css
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - drawinglayer/source include/vcl vcl/source
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 65 +++---
drawinglayer/source/processor2d/vclhelperbufferdevice.hxx |4
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |6 -
drawinglayer/source/processor2d/vclprocessor2d.cxx|8 -
include/vcl/outdev.hxx|2
vcl/source/outdev/wallpaper.cxx | 13 ++
6 files changed, 36 insertions(+), 62 deletions(-)
New commits:
commit d5a8056981562bfd5d191a7ceb0131cb52d06749
Author: Mike Kaganski
AuthorDate: Thu Aug 13 18:12:37 2020 +0300
Commit: Caolán McNamara
CommitDate: Fri Aug 14 15:31:44 2020 +0200
tdf#135500: always use transparent and clear content vdev in impBufferDevice
This removes the only place that hadn't used transparent impBufferDevice
yet - in VclProcessor2D::RenderMaskPrimitive2DPixel. Not clearing the vdev
made it draw on whatever garbage was left there from previous paints when
the buffer was taken from maFreeBuffers in VDevBuffer::alloc, so since this
was also the only place left that didn't clear the buffer explicitly, this
makes the clear unconditional in impBufferDevice ctor.
Also this makes sure to clear proper rectangle in VDevBuffer::alloc, and to
clear mpAlphaVDev in OutputDevice::Erase.
Change-Id: I7c1c0cc510a92628f19020b3faf0c0cd81f5a599
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100674
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100712
Reviewed-by: Caolán McNamara
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 647825959108..d2101cc9952f 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -68,8 +68,8 @@ public:
VDevBuffer();
virtual ~VDevBuffer() override;
-VclPtr alloc(OutputDevice& rOutDev, const Size& rSizePixel,
bool bClear,
-bool bMonoChrome, bool bTransparent);
+VclPtr alloc(OutputDevice& rOutDev, const Size& rSizePixel,
bool bMonoChrome,
+bool bTransparent);
void free(VirtualDevice& rDevice);
// Timer virtuals
@@ -103,7 +103,7 @@ VDevBuffer::~VDevBuffer()
}
}
-VclPtr VDevBuffer::alloc(OutputDevice& rOutDev, const Size&
rSizePixel, bool bClear,
+VclPtr VDevBuffer::alloc(OutputDevice& rOutDev, const Size&
rSizePixel,
bool bMonoChrome, bool bTransparent)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -192,15 +192,12 @@ VclPtr VDevBuffer::alloc(OutputDevice&
rOutDev, const Size& rSize
{
if (bOkay)
{
-if (bClear)
-{
-pRetval->Erase(
-::tools::Rectangle(0, 0, rSizePixel.getWidth(),
rSizePixel.getHeight()));
-}
+pRetval->Erase(pRetval->PixelToLogic(
+tools::Rectangle(0, 0, rSizePixel.getWidth(),
rSizePixel.getHeight(;
}
else
{
-pRetval->SetOutputSizePixel(rSizePixel, bClear);
+pRetval->SetOutputSizePixel(rSizePixel, true);
}
}
}
@@ -212,7 +209,7 @@ VclPtr VDevBuffer::alloc(OutputDevice&
rOutDev, const Size& rSize
rOutDev, bMonoChrome ? DeviceFormat::BITMASK :
DeviceFormat::DEFAULT,
bTransparent ? DeviceFormat::DEFAULT : DeviceFormat::NONE);
maDeviceTemplates[pRetval] = &rOutDev;
-pRetval->SetOutputSizePixel(rSizePixel, bClear);
+pRetval->SetOutputSizePixel(rSizePixel, true);
}
else
{
@@ -273,13 +270,11 @@ VDevBuffer& getVDevBuffer()
return *aVDevBuffer.get();
}
-impBufferDevice::impBufferDevice(OutputDevice& rOutDev, const
basegfx::B2DRange& rRange,
- bool bContentTransparent)
+impBufferDevice::impBufferDevice(OutputDevice& rOutDev, const
basegfx::B2DRange& rRange)
: mrOutDev(rOutDev)
, mpContent(nullptr)
, mpMask(nullptr)
, mpAlpha(nullptr)
-, mbContentTransparent(bContentTransparent)
{
basegfx::B2DRange aRangePixel(rRange);
aRangePixel.transform(mrOutDev.GetViewTransformation());
@@ -294,29 +289,13 @@ impBufferDevice::impBufferDevice(OutputDevice& rOutDev,
const basegfx::B2DRange&
if (!isVisible())
return;
-#ifdef IOS
-// Exact mechanism unknown, but for some reason SmartArt
-// rendering, especially shadows, is broken on iOS unless
-// we pass 'true' here. Are virtual devices always de
-// facto cleared when created on other platforms?
-mpContent
-= getVDevBuffer().alloc(mrOutDev, maDestPixel.GetSize(), true, false,
bContentTransparent);
-#else
-mpContent
-= getVDevBuffer().alloc(mrOutDev
[Libreoffice-commits] online.git: loleaflet/Makefile.am
loleaflet/Makefile.am |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 22fd4ebaa6b7fe43cfcf97f3d8ad4b215d86df0e
Author: Henry Castro
AuthorDate: Mon Jul 6 15:25:36 2020 -0400
Commit: Henry Castro
CommitDate: Fri Aug 14 15:42:13 2020 +0200
admin: fix build when builddir != srcdir
Change-Id: If29863c06a8c296d5d4b7c37f0f6473e949e4371
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98223
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 729fd05e8..44c4886fa 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -89,7 +89,6 @@ LOLEAFLET_ADMIN_TS =\
LOLEAFLET_ADMIN_TS_JS = $(patsubst
%.ts,$(TYPESCRIPT_JS_DIR)/%.js,$(LOLEAFLET_ADMIN_TS))
LOLEAFLET_ADMIN_JS =\
- $(LOLEAFLET_ADMIN_TS_JS) \
admin/src/Base.js \
admin/src/Admin.js \
admin/src/AdminSocketBase.js \
@@ -403,7 +402,7 @@ endif
$(TYPESCRIPT_JS_DIR)/%.js: $(srcdir)/%.ts
@mkdir -p $(dir $@)
- $(srcdir)/node_modules/typescript/bin/tsc --outFile $@ $<
+ $(builddir)/node_modules/typescript/bin/tsc --outFile $@ $<
build-loleaflet: \
$(LOLEAFLET_L10N_DST) \
@@ -432,11 +431,11 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
$(INTERMEDIATE_DIR)/admin-src.js
@NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE)
node_modules/browserify/bin/cmd.js -g browserify-css $(if
$(IS_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
-$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_JS)
+$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_TS_JS)
$(LOLEAFLET_ADMIN_JS)
@mkdir -p $(dir $@)
@echo "Checking for admin JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
- @awk 'FNR == 1 {print ""} 1' $(patsubst
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
+ @awk 'FNR == 1 {print ""} 1' $(LOLEAFLET_ADMIN_TS_JS) $(patsubst
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet)
@mkdir -p $(dir $@)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - xmloff/CppunitTest_xmloff_draw.mk xmloff/Module_xmloff.mk xmloff/qa xmloff/source
xmloff/CppunitTest_xmloff_draw.mk | 45 +++
xmloff/Module_xmloff.mk |1
xmloff/qa/unit/data/textbox-loss.docx |binary
xmloff/qa/unit/draw.cxx | 79 ++
xmloff/source/draw/shapeexport.cxx| 14 --
5 files changed, 127 insertions(+), 12 deletions(-)
New commits:
commit 9902f6f7e567e6a1585833c751f5c19bf559705c
Author: Miklos Vajna
AuthorDate: Wed Aug 12 09:06:14 2020 +0200
Commit: Xisco Fauli
CommitDate: Fri Aug 14 15:47:35 2020 +0200
tdf#135144 xmloff textbox: fix export style name to be consitent with import
Regression from commit 28d67b792724a23015dec32fb0278b729f676736
(tdf#107776 sw ODF shape import: make is-textbox check more strict,
2019-08-26), the problem was that in case the import side in
SdXMLCustomShapeContext expects a fixed "Frame" parent style name, then
the export side should go with that name as well.
Fix the problem by simplifying XMLShapeExport::collectShapeAutoStyles(),
which initially assumed that the string may be localized, so try to look
it up: instead just use the fixed string that the import side will look
for.
This solves all problem which may stem from a parent style name which is
non-empty, but other than Frame.
(cherry picked from commit 347d05edd8910907ae185c61c1e56eee139b3c09)
Change-Id: I8146440c591d3dd5a904d243d85741d704711e9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100595
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/xmloff/CppunitTest_xmloff_draw.mk
b/xmloff/CppunitTest_xmloff_draw.mk
new file mode 100644
index ..4ebac5c27a3b
--- /dev/null
+++ b/xmloff/CppunitTest_xmloff_draw.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,xmloff_draw))
+
+$(eval $(call gb_CppunitTest_use_externals,xmloff_draw,\
+ boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,xmloff_draw, \
+xmloff/qa/unit/draw \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,xmloff_draw, \
+comphelper \
+cppu \
+embobj \
+sal \
+test \
+unotest \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,xmloff_draw))
+
+$(eval $(call gb_CppunitTest_use_ure,xmloff_draw))
+$(eval $(call gb_CppunitTest_use_vcl,xmloff_draw))
+
+$(eval $(call gb_CppunitTest_use_rdb,xmloff_draw,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,xmloff_draw,\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,xmloff_draw))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index fe69b86b09f6..8f5853c9da41 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Module_add_check_targets,xmloff,\
CppunitTest_xmloff_uxmloff) \
CppunitTest_xmloff_style \
CppunitTest_xmloff_text \
+ CppunitTest_xmloff_draw \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
diff --git a/xmloff/qa/unit/data/textbox-loss.docx
b/xmloff/qa/unit/data/textbox-loss.docx
new file mode 100644
index ..9190e662f851
Binary files /dev/null and b/xmloff/qa/unit/data/textbox-loss.docx differ
diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx
new file mode 100644
index ..afffa65354e0
--- /dev/null
+++ b/xmloff/qa/unit/draw.cxx
@@ -0,0 +1,79 @@
+/* -*- 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/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+using namespace ::com::sun::star;
+
+char const DATA_DIRECTORY[] = "/xmloff/qa/unit/data/";
+
+/// Covers xmloff/source/draw/ fixes.
+class XmloffDrawTest : public test::BootstrapFixture, public
unotest::MacrosTest
+{
+private:
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
+};
+
+void XmloffDrawTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void XmloffDrawTest::tearDown()
+{
+if (mxComponent.is())
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/sifr icon-themes/sifr_dark icon-the
icon-themes/breeze/cmd/32/orientation.png |binary icon-themes/breeze/cmd/lc_orientation.png |binary icon-themes/breeze/cmd/sc_orientation.png |binary icon-themes/breeze_dark/cmd/32/orientation.png |binary icon-themes/breeze_dark/cmd/lc_orientation.png |binary icon-themes/breeze_dark/cmd/sc_orientation.png |binary icon-themes/breeze_dark_svg/cmd/32/orientation.svg |2 +- icon-themes/breeze_dark_svg/cmd/lc_orientation.svg |2 +- icon-themes/breeze_dark_svg/cmd/sc_orientation.svg |3 ++- icon-themes/breeze_svg/cmd/32/orientation.svg |2 +- icon-themes/breeze_svg/cmd/lc_orientation.svg |2 +- icon-themes/breeze_svg/cmd/sc_orientation.svg |3 ++- icon-themes/sifr/cmd/32/orientation.png|binary icon-themes/sifr/cmd/lc_orientation.png|binary icon-themes/sifr/cmd/sc_orientation.png|binary icon-themes/sifr_dark/cmd/32/orientation.png |binary icon-themes/sifr_dark/cmd/lc_orientation.png |binary icon-themes/sifr_dark/cmd/sc_orientation.png |binary icon-themes/sifr_dark_svg/cmd/32/orientation.svg |2 +- icon-themes/sifr_dark_svg/cmd/lc_orientation.svg |2 +- icon-themes/sifr_dark_svg/cmd/sc_orientation.svg |2 +- icon-themes/sifr_svg/cmd/32/orientation.svg|2 +- icon-themes/sifr_svg/cmd/lc_orientation.svg|2 +- icon-themes/sifr_svg/cmd/sc_orientation.svg|2 +- 24 files changed, 14 insertions(+), 12 deletions(-) New commits: commit 4702c1bdc84d3de18954086998f426d37fb0ae50 Author: Rizal Muttaqin AuthorDate: Fri Aug 14 14:36:10 2020 +0700 Commit: Rizal Muttaqin CommitDate: Fri Aug 14 15:48:47 2020 +0200 Breeze & Sifr tdf#131456 ^ Orientation icons Change-Id: I61beac52faea227e98a09d97cf222968348bf542 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100723 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit fa575be1e59b333a9aadcf4161686dfae2faa555) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100698 diff --git a/icon-themes/breeze/cmd/32/orientation.png b/icon-themes/breeze/cmd/32/orientation.png index 112feaea7f9b..3f76996d8072 100644 Binary files a/icon-themes/breeze/cmd/32/orientation.png and b/icon-themes/breeze/cmd/32/orientation.png differ diff --git a/icon-themes/breeze/cmd/lc_orientation.png b/icon-themes/breeze/cmd/lc_orientation.png index 7827668b2453..61ca37e48b8d 100644 Binary files a/icon-themes/breeze/cmd/lc_orientation.png and b/icon-themes/breeze/cmd/lc_orientation.png differ diff --git a/icon-themes/breeze/cmd/sc_orientation.png b/icon-themes/breeze/cmd/sc_orientation.png index c05c32f25798..183e205830ee 100644 Binary files a/icon-themes/breeze/cmd/sc_orientation.png and b/icon-themes/breeze/cmd/sc_orientation.png differ diff --git a/icon-themes/breeze_dark/cmd/32/orientation.png b/icon-themes/breeze_dark/cmd/32/orientation.png index de806e14f828..55659d77f5fe 100644 Binary files a/icon-themes/breeze_dark/cmd/32/orientation.png and b/icon-themes/breeze_dark/cmd/32/orientation.png differ diff --git a/icon-themes/breeze_dark/cmd/lc_orientation.png b/icon-themes/breeze_dark/cmd/lc_orientation.png index 981ecd3ca7ac..aa3d8185c08a 100644 Binary files a/icon-themes/breeze_dark/cmd/lc_orientation.png and b/icon-themes/breeze_dark/cmd/lc_orientation.png differ diff --git a/icon-themes/breeze_dark/cmd/sc_orientation.png b/icon-themes/breeze_dark/cmd/sc_orientation.png index 32a58f69585b..583885daf4c5 100644 Binary files a/icon-themes/breeze_dark/cmd/sc_orientation.png and b/icon-themes/breeze_dark/cmd/sc_orientation.png differ diff --git a/icon-themes/breeze_dark_svg/cmd/32/orientation.svg b/icon-themes/breeze_dark_svg/cmd/32/orientation.svg index 81a5ec8e18a3..fc2df52e82ec 100644 --- a/icon-themes/breeze_dark_svg/cmd/32/orientation.svg +++ b/icon-themes/breeze_dark_svg/cmd/32/orientation.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/cmd/lc_orientation.svg b/icon-themes/breeze_dark_svg/cmd/lc_orientation.svg index 1d2f28c975a3..69d90156fa03 100644 --- a/icon-themes/breeze_dark_svg/cmd/lc_orientation.svg +++ b/icon-themes/breeze_dark_svg/cmd/lc_orientation.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/cmd/sc_orientation.svg b/icon-themes/breeze_dark_svg/cmd/sc_orientation.svg index 42b445ebee70..cdccc79b3450 100644 --- a/icon-themes/breeze_dark_svg/cmd/sc_orientation.svg +++ b/icon-themes/breeze_dark_svg/cmd/sc_orientation.svg @@ -1 +1,2 @@ -http://www.w3.org/2000/svg";>/> \ No newline at end of file +http://www.w3.org/2000/svg";> +/> \ No newline at end of file diff --git a/icon-themes/breeze_svg/cmd/32/orientation.svg b/icon-themes/breeze_svg/cmd/32/orientation.svg ind
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/CppunitTest.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 02ac9b042d544dc8cf261017e0f31721f30642cd Author: Miklos Vajna AuthorDate: Fri Aug 14 13:53:43 2020 +0200 Commit: Miklos Vajna CommitDate: Fri Aug 14 16:18:22 2020 +0200 solenv: fix typo in CppunitTest Added in commit 2edc86a592bc943fcffef0a8ae8db220e18e2b37 (Default all tests to run with the svp plugin, 2018-11-23), if svp is to be avoided, it has to be filtered out from the environment variables, not filtered for. With this, the unexpected SAL_USE_VCLPLUGIN=gen is gone from the generated cmdline when using gb_CppunitTest_use_vcl_non_headless. Change-Id: Ib666f3df007898165f2019f0a9b0677f679aa6e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100742 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index efe39ed45a8d..4a33ac581366 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -122,7 +122,7 @@ else $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \ $(if $(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \ $(if $(gb_CppunitTest__vcl_no_svp), \ - $(filter SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \ + $(filter-out SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \ $(EXTRA_ENV_VARS) \ $(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/table/tabledlg.cxx|9 +
sw/source/uibase/table/tablepg.hxx |2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit bfd3f939325e53c9dc85d2486316927c2b34eaf8
Author: Caolán McNamara
AuthorDate: Thu Aug 13 17:03:11 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 14 16:33:31 2020 +0200
tdf#135693 rerun the callbacks on inconsistency just once
Change-Id: I250cf11b816e91b521378c132e4ee8065956bb73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100679
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 9e2259e6ad65..77cf26c43042 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -267,7 +267,7 @@ IMPL_LINK( SwFormatTablePage, ValueChangedHdl,
weld::MetricSpinButton&, rEdit, v
ModifyHdl(rEdit);
}
-void SwFormatTablePage::ModifyHdl(const weld::MetricSpinButton& rEdit)
+void SwFormatTablePage::ModifyHdl(const weld::MetricSpinButton& rEdit, bool
bAllowInconsistencies)
{
SwTwips nCurWidth = static_cast< SwTwips
>(m_xWidthMF->DenormalizePercent(m_xWidthMF->get_value(FieldUnit::TWIP)));
SwTwips nPrevWidth = nCurWidth;
@@ -371,9 +371,10 @@ void SwFormatTablePage::ModifyHdl(const
weld::MetricSpinButton& rEdit)
// tdf#135021 if the user changed the width spinbutton, and in this
// ModifyHdl we changed the value of that width spinbutton, then rerun
// the ModifyHdl on the replaced value so the left/right/width value
-// relationships are consistent
-if (&rEdit == m_xWidthMF->get())
-ModifyHdl(rEdit);
+// relationships are consistent.
+// But (tdf#135693) only make one effort of rectifying the
inconsistency
+if (&rEdit == m_xWidthMF->get() && !bAllowInconsistencies)
+ModifyHdl(rEdit, true);
}
bModified = true;
diff --git a/sw/source/uibase/table/tablepg.hxx
b/sw/source/uibase/table/tablepg.hxx
index 60e8938e6b39..adfee146e03c 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -69,7 +69,7 @@ class SwFormatTablePage : public SfxTabPage
int m_nOrigRightMax;
voidInit();
-voidModifyHdl(const weld::MetricSpinButton& rEdit);
+void ModifyHdl(const weld::MetricSpinButton& rEdit, bool
bAllowInconsistencies = false);
DECL_LINK(AutoClickHdl, weld::ToggleButton&, void);
DECL_LINK(RelWidthClickHdl, weld::ToggleButton&, void);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/frmtool.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit f3cb59c46398b3a0646b8b374d5626f715fa6884
Author: Michael Stahl
AuthorDate: Tue Aug 11 17:54:09 2020 +0200
Commit: Michael Stahl
CommitDate: Fri Aug 14 16:56:58 2020 +0200
tdf#134746 sw: fix redline hiding of at-char fly on empty paragraphs
If a merged paragraph has no extents, a fly anchored at the start or at
the end should be shown.
(regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)
Change-Id: I78135f3c033cf08aad81c86b0ac693528e3f3f8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100543
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index 9dac5b885233..2a56f8e5cb04 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1274,6 +1274,17 @@ bool IsAnchoredObjShown(SwTextFrame const& rFrame,
SwFormatAnchor const& rAnchor
ret = false;
auto const pAnchor(rAnchor.GetContentAnchor());
auto iterFirst(pMergedPara->extents.cbegin());
+if (iterFirst == pMergedPara->extents.end()
+&& (rAnchor.GetAnchorId() == RndStdIds::FLY_AT_PARA
+|| rAnchor.GetAnchorId() == RndStdIds::FLY_AT_CHAR))
+{
+ret = (&pAnchor->nNode.GetNode() == pMergedPara->pFirstNode
+&& (rAnchor.GetAnchorId() == RndStdIds::FLY_AT_PARA
+|| pAnchor->nContent == 0))
+|| (&pAnchor->nNode.GetNode() == pMergedPara->pLastNode
+&& (rAnchor.GetAnchorId() == RndStdIds::FLY_AT_PARA
+|| pAnchor->nContent ==
pMergedPara->pLastNode->Len()));
+}
auto iter(iterFirst);
SwTextNode const* pNode(pMergedPara->pFirstNode);
for ( ; ; ++iter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang framework/inc framework/source include/framework include/svtools sfx2/source solenv/clang-format svtools/Library_svt.mk svtools/source
compilerplugins/clang/writeonlyvars.cxx |2
framework/source/uielement/generictoolbarcontroller.cxx | 42 ++-
framework/source/uielement/toolbarmanager.cxx |2
framework/source/uielement/toolbarmerger.cxx|2
include/framework/generictoolbarcontroller.hxx | 12
include/svtools/generictoolboxcontroller.hxx| 74 -
sfx2/source/sidebar/ControllerFactory.cxx |7
solenv/clang-format/excludelist |4
svtools/Library_svt.mk |1
svtools/source/uno/generictoolboxcontroller.cxx | 224
10 files changed, 55 insertions(+), 315 deletions(-)
New commits:
commit 7bb20ab2e84cf4d84d24bfcd8103946e92f2ae06
Author: Maxim Monastirsky
AuthorDate: Thu Aug 13 01:05:59 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Fri Aug 14 17:03:55 2020 +0200
One toolbar generic controller is enough
The one from framework is more feature complete, so use that one.
Change-Id: I499f0ae1d20c588cfc04beebc643819559325882
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100726
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/compilerplugins/clang/writeonlyvars.cxx
b/compilerplugins/clang/writeonlyvars.cxx
index 6161b428557a..51a967dac8a0 100644
--- a/compilerplugins/clang/writeonlyvars.cxx
+++ b/compilerplugins/clang/writeonlyvars.cxx
@@ -252,8 +252,6 @@ void WriteOnlyVars::run()
return;
if (loplugin::isSamePathname(fn, SRCDIR
"/svtools/source/filter/SvFilterOptionsDialog.cxx"))
return;
-if (loplugin::isSamePathname(fn, SRCDIR
"/svtools/source/uno/generictoolboxcontroller.cxx"))
-return;
if (loplugin::isSamePathname(fn, SRCDIR
"/svtools/source/java/javainteractionhandler.cxx"))
return;
if (loplugin::isSamePathname(fn, SRCDIR
"/basic/source/classes/sbunoobj.cxx"))
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx
b/framework/source/uielement/generictoolbarcontroller.cxx
index 8bea883d90d6..f8dc874b2902 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
+#include
#include
#include
@@ -28,6 +28,7 @@
#include
#include
+#include
#include
#include
#include
@@ -92,6 +93,20 @@ GenericToolbarController::GenericToolbarController( const
Reference< XComponentC
{
if ( m_bEnumCommand )
addStatusListener( getMasterCommand( aCommand ) );
+
+addStatusListener( aCommand );
+
+// Initialization is done through ctor
+m_bInitialized = true;
+}
+
+GenericToolbarController::GenericToolbarController( const Reference<
XComponentContext >&rxContext,
+const Reference< XFrame >&
rFrame,
+weld::Toolbar&
rToolbar,
+const OUString&
aCommand ) :
+GenericToolbarController( rxContext, rFrame, nullptr, 0, aCommand )
+{
+m_pToolbar = &rToolbar;
}
GenericToolbarController::~GenericToolbarController()
@@ -104,6 +119,7 @@ void SAL_CALL GenericToolbarController::dispose()
svt::ToolboxController::dispose();
+m_pToolbar = nullptr;
m_xToolbar.clear();
m_nID = 0;
}
@@ -159,6 +175,30 @@ void GenericToolbarController::statusChanged( const
FeatureStateEvent& Event )
if ( m_bDisposed )
return;
+if ( m_pToolbar )
+{
+OString sId = m_aCommandURL.toUtf8();
+
+m_pToolbar->set_item_sensitive(sId, Event.IsEnabled);
+
+boolbValue;
+OUStringaStrValue;
+
+if ( Event.State >>= bValue )
+{
+// Boolean, treat it as checked/unchecked
+m_pToolbar->set_item_active(sId, bValue);
+}
+else if ( Event.State >>= aStrValue )
+{
+m_pToolbar->set_item_label(sId, aStrValue);
+}
+else
+m_pToolbar->set_item_active(sId, false);
+
+return;
+}
+
if ( !m_xToolbar )
return;
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index e3d8a20f8b4b..2582bcd109d9 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -23,7 +23,7 @@
#include
-#include
+#include
#include
#include
#include
diff --git a/framework/source/uielement/toolbarmerger.cxx
b/framework/source/uielement/toolbarmerger.cxx
index b2307a9483de..c012576fa35b 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -18,7 +18,7 @@
*/
#in
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/uielement/generictoolbarcontroller.hxx| 22 ---
framework/source/uielement/generictoolbarcontroller.cxx | 95
framework/source/uielement/popuptoolbarcontroller.cxx | 33 -
framework/source/uielement/resourcemenucontroller.cxx |4
framework/source/uielement/toolbarmanager.cxx |3
5 files changed, 33 insertions(+), 124 deletions(-)
New commits:
commit c5301f215fec9016c3a75ff4a6a0c6c22f152718
Author: Maxim Monastirsky
AuthorDate: Wed Aug 12 23:36:52 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Fri Aug 14 17:03:41 2020 +0200
Replace MenuToolbarController with the usual approach for menu buttons
i.e. ResourceMenuController + GenericPopupToolbarController.
(Decl. of both isn't available in a header file, so they are instantiated
via the service manager for now. This is a bit weird for something from
the same module, but should not make any difference in practice.)
Change-Id: Ia3fc7ba82b0f6e1a43aa7b5e56e2cff7e039d877
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100725
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx
b/framework/inc/uielement/generictoolbarcontroller.hxx
index eac6e8276b50..35934818ccb7 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -21,13 +21,8 @@
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
#include
-#include
-
-#include
-#include
#include
-class PopupMenu;
class ToolBox;
namespace framework
@@ -69,23 +64,6 @@ class GenericToolbarController final : public
svt::ToolboxController
OUStringm_aEnumCommand;
};
-class MenuToolbarController final : public svt::ToolboxController
-{
-css::uno::Reference< css::container::XIndexAccess > m_xMenuDesc;
-VclPtr pMenu;
-css::uno::Reference< css::lang::XComponent >m_xMenuManager;
-
-public:
-// XStatusListener
-virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent&
) override {}
-// XComponent
-virtual void SAL_CALL dispose() override;
-// XInitialization
-virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rArgs ) override;
-// XToolbarController
-virtual css::uno::Reference< css::awt::XWindow > SAL_CALL
createPopupWindow() override;
-};
-
}
#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx
b/framework/source/uielement/generictoolbarcontroller.cxx
index b13739932b32..8bea883d90d6 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -21,30 +21,22 @@
#include
#include
-#include
#include
#include
#include
-#include
-#include
#include
-#include
#include
#include
#include
#include
#include
-#include
-using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::frame::status;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::container;
namespace framework
{
@@ -281,93 +273,6 @@ IMPL_STATIC_LINK( GenericToolbarController,
ExecuteHdl_Impl, void*, p, void )
delete pExecuteInfo;
}
-void MenuToolbarController::dispose()
-{
-try
-{
-if ( m_xMenuManager.is() )
-m_xMenuManager->dispose();
-}
-catch( const Exception& ) {}
-
-m_xMenuManager.clear();
-m_xMenuDesc.clear();
-pMenu.disposeAndClear();
-}
-
-void MenuToolbarController::initialize( const css::uno::Sequence<
css::uno::Any >& rArgs )
-{
-ToolboxController::initialize( rArgs );
-
-css::uno::Reference< css::container::XIndexAccess > xMenuContainer;
-try
-{
-css::uno::Reference< css::frame::XController > xController(
m_xFrame->getController() );
-css::uno::Reference< css::ui::XUIConfigurationManagerSupplier >
xSupplier( xController->getModel(), css::uno::UNO_QUERY_THROW );
-css::uno::Reference< css::ui::XUIConfigurationManager >
xConfigManager( xSupplier->getUIConfigurationManager() );
-xMenuContainer.set( xConfigManager->getSettings( m_aCommandURL, false
) );
-}
-catch( const css::uno::Exception& )
-{}
-
-if ( !xMenuContainer.is() )
-{
-try
-{
-css::uno::Reference<
css::ui::XModuleUIConfigurationManagerSupplier > xSupplier(
-css::ui::theModuleUIConfigurationManagerSupplier::get(
m_xContext ) );
-css::uno::Reference< css::ui::XUIConfigurationManager >
xConfigManager(
-xSupplier->getUIConfigurationManager( m_sModuleName ) );
-
[Libreoffice-commits] core.git: include/svtools svtools/source svx/source
include/svtools/editbrowsebox.hxx | 27 +--
svtools/source/brwbox/ebbcontrols.cxx | 10 --
svx/source/fmcomp/gridcell.cxx| 23 ++-
svx/source/inc/gridcell.hxx |6 +++---
4 files changed, 50 insertions(+), 16 deletions(-)
New commits:
commit 937f800cdb644b22b4c7bd18b35a8940bcede7ce
Author: Caolán McNamara
AuthorDate: Fri Aug 14 14:41:35 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 14 17:27:37 2020 +0200
tdf#135550 make XListBox Item status changed event work again
Change-Id: I9a5fe6a097c5d06e3ac3ab6c4c77cbe082d1a17d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100745
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svtools/editbrowsebox.hxx
b/include/svtools/editbrowsebox.hxx
index 725cc081d044..9e851acf9a3f 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -601,6 +601,11 @@ namespace svt
//= ListBoxControl
class SVT_DLLPUBLIC ListBoxControl final : public ControlBase
{
+private:
+std::unique_ptr m_xWidget;
+Link m_aModify1Hdl;
+Link m_aModify2Hdl;
+
friend class ListBoxCellController;
public:
@@ -608,9 +613,27 @@ namespace svt
weld::ComboBox& get_widget() { return *m_xWidget; }
+// sets a link to call when the selection is changed by the user
+void SetModifyHdl(const Link& rHdl)
+{
+m_aModify1Hdl = rHdl;
+}
+
+// sets an additional link to call when the selection is changed by
the user
+void SetAuxModifyHdl(const Link& rLink)
+{
+m_aModify2Hdl = rLink;
+}
+
virtual void dispose() override;
private:
-std::unique_ptr m_xWidget;
+DECL_LINK(SelectHdl, weld::ComboBox&, void);
+
+void CallModifyHdls()
+{
+m_aModify1Hdl.Call(nullptr);
+m_aModify2Hdl.Call(nullptr);
+}
};
//= ListBoxCellController
@@ -627,7 +650,7 @@ namespace svt
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const override;
private:
-DECL_LINK(ListBoxSelectHdl, weld::ComboBox&, void);
+DECL_LINK(ListBoxSelectHdl, LinkParamNone*, void);
};
class SVT_DLLPUBLIC FormattedControlBase : public EditControlBase
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index 1ac4605a3096..d08b83fef214 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -107,6 +107,7 @@ namespace svt
{
InitControlBase(m_xWidget.get());
m_xWidget->set_size_request(42, -1); // so a later narrow size request
can stick
+m_xWidget->connect_changed(LINK(this, ListBoxControl, SelectHdl));
}
void ListBoxControl::dispose()
@@ -115,11 +116,16 @@ namespace svt
ControlBase::dispose();
}
+IMPL_LINK_NOARG(ListBoxControl, SelectHdl, weld::ComboBox&, void)
+{
+CallModifyHdls();
+}
+
//= ListBoxCellController
ListBoxCellController::ListBoxCellController(ListBoxControl* pWin)
:CellController(pWin)
{
-GetListBox().connect_changed(LINK(this, ListBoxCellController,
ListBoxSelectHdl));
+static_cast(GetWindow()).SetModifyHdl(LINK(this,
ListBoxCellController, ListBoxSelectHdl));
}
bool ListBoxCellController::MoveAllowed(const KeyEvent& rEvt) const
@@ -157,7 +163,7 @@ namespace svt
GetListBox().save_value();
}
-IMPL_LINK_NOARG(ListBoxCellController, ListBoxSelectHdl, weld::ComboBox&,
void)
+IMPL_LINK_NOARG(ListBoxCellController, ListBoxSelectHdl, LinkParamNone*,
void)
{
callModifyHdl();
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index ee688865530a..4bc0b5179ee9 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3894,9 +3894,9 @@ FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn,
std::unique_ptr(m_pCellControl->GetWindow()).get_widget())
+ , m_pBox(&static_cast(m_pCellControl->GetWindow()))
{
-m_pBox->connect_changed(LINK(this, FmXListBoxCell, ChangedHdl));
+m_pBox->SetAuxModifyHdl(LINK(this, FmXListBoxCell, ChangedHdl));
}
FmXListBoxCell::~FmXListBoxCell()
@@ -3915,7 +3915,7 @@ void FmXListBoxCell::disposing()
m_aItemListeners.disposeAndClear(aEvt);
m_aActionListeners.disposeAndClear(aEvt);
-m_pBox->connect_changed( Link() );
+m_pBox->SetAuxModifyHdl(Link());
m_pBox = nullptr;
FmXTextCell::disposing();
@@ -3923,9 +3923,14 @@ void FmXListBoxCell::disposing()
IMPLEMENT_GET_IMPLEMENTATION_ID( FmXListBoxCell )
-IMPL_LINK_NOARG(FmXListBoxCell, ChangedHdl, weld::ComboBox&, void)
+IMPL_LINK_NOARG(FmXListBoxCell, ChangedHdl, LinkParamNone*, void)
{
-if (!m_pBox || !m_pBox->changed_by_direct_pick())
+
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - cypress_test/integration_tests
cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js | 11
+-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 0bf076fc729765b56738a1263674082892d29e50
Author: Tamás Zolnai
AuthorDate: Thu Jul 9 07:54:24 2020 +0200
Commit: Tamás Zolnai
CommitDate: Fri Aug 14 17:43:14 2020 +0200
cypress: avoid failure of time field insertion (impress, mobile).
Change-Id: I0330ae701a8d6a84f2cb57bc5ccef88f9fe56ecf
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98394
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
(cherry picked from commit dc5c44f712dfbaa42a8a0fe171638ca241799a93)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100750
diff --git
a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index 794fd5e4d..1231b5efb 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -33,7 +33,7 @@ describe('Impress insertion wizard.', function() {
helper.selectAllText(false);
}
- function selectionShouldBeTextShape() {
+ function selectionShouldBeTextShape(checkTextShape = true) {
// Check that the shape is there
cy.get('.leaflet-pane.leaflet-overlay-pane svg')
.should(function(svg) {
@@ -41,8 +41,9 @@ describe('Impress insertion wizard.', function() {
expect(svg[0].getBBox().height).to.be.greaterThan(0);
});
- cy.get('.leaflet-pane.leaflet-overlay-pane g.Page g')
- .should('have.class', 'com.sun.star.drawing.TextShape');
+ if (checkTextShape)
+ cy.get('.leaflet-pane.leaflet-overlay-pane svg
g.com\\.sun\\.star\\.drawing\\.TextShape')
+ .should('exist');
// Check also that the shape is fully visible
// TODO: shapes are hungs out of the slide after insertion
@@ -272,7 +273,7 @@ describe('Impress insertion wizard.', function() {
.click();
// Check that the shape is there
- selectionShouldBeTextShape();
+ selectionShouldBeTextShape(false);
// Check the text
selectTextOfShape();
@@ -293,7 +294,7 @@ describe('Impress insertion wizard.', function() {
.click();
// Check that the shape is there
- selectionShouldBeTextShape();
+ selectionShouldBeTextShape(false);
// Check the text
selectTextOfShape();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/fmcomp/gridcell.cxx | 262 +
svx/source/inc/gridcell.hxx| 32 +
2 files changed, 294 insertions(+)
New commits:
commit 186def8f48e273c3a3b4d23b3ab2efd0d8664731
Author: Caolán McNamara
AuthorDate: Fri Aug 14 15:05:34 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Aug 14 17:59:34 2020 +0200
tdf#135550 FmXListBoxCell does need to implement XListBox after all
regression since...
commit 0677d46bcc56c1f6c27b9331662990b38fd452d6
Author: Caolán McNamara
Date: Wed May 20 15:22:56 2020 +0100
FmXListBoxCell doesn't need to implement css::awt::XListBox
It seems just addItemListener/removeItemListener are needed, stub
the rest to make sense just for single-selection mode and avoid
the return of the apparently unused multi-selection complexity
Change-Id: I46a32bdd23d44273da37cc21cfa45de907674f31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100746
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 4bc0b5179ee9..58c46c9a6f27 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3895,6 +3895,8 @@ FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn,
std::unique_ptr(m_pCellControl->GetWindow()))
+ ,
m_nLines(Application::GetSettings().GetStyleSettings().GetListBoxMaximumLineCount())
+ , m_bMulti(false)
{
m_pBox->SetAuxModifyHdl(LINK(this, FmXListBoxCell, ChangedHdl));
}
@@ -3921,8 +3923,268 @@ void FmXListBoxCell::disposing()
FmXTextCell::disposing();
}
+Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType )
+{
+Any aReturn = FmXTextCell::queryAggregation(_rType);
+
+if ( !aReturn.hasValue() )
+aReturn = FmXListBoxCell_Base::queryInterface( _rType );
+
+return aReturn;
+}
+
+Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes( )
+{
+return ::comphelper::concatSequences(
+FmXTextCell::getTypes(),
+FmXListBoxCell_Base::getTypes()
+);
+}
+
IMPLEMENT_GET_IMPLEMENTATION_ID( FmXListBoxCell )
+void SAL_CALL FmXListBoxCell::addItemListener(const Reference<
css::awt::XItemListener >& l)
+{
+m_aItemListeners.addInterface( l );
+}
+
+void SAL_CALL FmXListBoxCell::removeItemListener(const Reference<
css::awt::XItemListener >& l)
+{
+m_aItemListeners.removeInterface( l );
+}
+
+void SAL_CALL FmXListBoxCell::addActionListener(const Reference<
css::awt::XActionListener >& l)
+{
+m_aActionListeners.addInterface( l );
+}
+
+void SAL_CALL FmXListBoxCell::removeActionListener(const Reference<
css::awt::XActionListener >& l)
+{
+m_aActionListeners.removeInterface( l );
+}
+
+void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos)
+{
+::osl::MutexGuard aGuard( m_aMutex );
+if (m_pBox)
+{
+weld::ComboBox& rBox = m_pBox->get_widget();
+rBox.insert_text(nPos, aItem);
+}
+}
+
+void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence&
aItems, sal_Int16 nPos)
+{
+::osl::MutexGuard aGuard( m_aMutex );
+if (m_pBox)
+{
+weld::ComboBox& rBox = m_pBox->get_widget();
+sal_uInt16 nP = nPos;
+for ( const auto& rItem : aItems )
+{
+rBox.insert_text(nP, rItem);
+if ( nPos != -1 )// Not if 0x, because LIST_APPEND
+nP++;
+}
+}
+}
+
+void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount)
+{
+::osl::MutexGuard aGuard( m_aMutex );
+if ( m_pBox )
+{
+weld::ComboBox& rBox = m_pBox->get_widget();
+for ( sal_uInt16 n = nCount; n; )
+rBox.remove( nPos + (--n) );
+}
+}
+
+sal_Int16 SAL_CALL FmXListBoxCell::getItemCount()
+{
+::osl::MutexGuard aGuard( m_aMutex );
+if (!m_pBox)
+return 0;
+weld::ComboBox& rBox = m_pBox->get_widget();
+return rBox.get_count();
+}
+
+OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos)
+{
+::osl::MutexGuard aGuard( m_aMutex );
+if (!m_pBox)
+return OUString();
+weld::ComboBox& rBox = m_pBox->get_widget();
+return rBox.get_text(nPos);
+}
+
+css::uno::Sequence SAL_CALL FmXListBoxCell::getItems()
+{
+::osl::MutexGuard aGuard( m_aMutex );
+
+css::uno::Sequence aSeq;
+if (m_pBox)
+{
+weld::ComboBox& rBox = m_pBox->get_widget();
+const sal_Int32 nEntries = rBox.get_count();
+aSeq = css::uno::Sequence( nEntries );
+for ( sal_Int32 n = nEntries; n; )
+{
+--n;
+aSeq.getArray()[n] = rBox.get_text( n );
+}
+}
+return aSeq;
+}
+
+sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos()
+{
+::osl::MutexGuard aGuard( m_aMutex );
+if (m_pBox)
+{
+UpdateFromColumn();
+weld::ComboBox& rBox = m_pBox->get_widget();
+sal_Int32 nPos = rBox.get_active();
+
[Libreoffice-commits] core.git: avmedia/source basctl/source basegfx/source basic/source canvas/source chart2/source comphelper/source compilerplugins/clang connectivity/source cppuhelper/source cui/s
avmedia/source/viewer/mediawindow_impl.cxx|2 - basctl/source/basicide/baside2.cxx|4 +- basctl/source/basicide/basidesh.cxx |2 - basegfx/source/color/bcolormodifier.cxx | 10 ++--- basegfx/source/matrix/b3dhommatrix.cxx|2 - basic/source/classes/sbxmod.cxx |4 +- basic/source/runtime/runtime.cxx |2 - basic/source/sbx/sbxvar.cxx |2 - basic/source/uno/namecont.cxx |2 - canvas/source/cairo/cairo_spritehelper.cxx|2 - canvas/source/vcl/spritehelper.cxx|3 - chart2/source/controller/main/ChartController_Window.cxx |2 - chart2/source/model/main/ChartModel_Persistence.cxx |2 - chart2/source/tools/InternalDataProvider.cxx |2 - chart2/source/view/axes/Tickmarks_Equidistant.cxx |2 - chart2/source/view/charttypes/BarChart.cxx|2 - chart2/source/view/main/ChartView.cxx |2 - comphelper/source/misc/backupfilehelper.cxx |4 +- compilerplugins/clang/simplifybool.cxx| 12 -- connectivity/source/commontools/TColumnsHelper.cxx|2 - connectivity/source/commontools/TIndexes.cxx |2 - connectivity/source/commontools/TKeys.cxx |2 - connectivity/source/drivers/jdbc/CallableStatement.cxx|2 - connectivity/source/drivers/jdbc/JStatement.cxx |2 - connectivity/source/drivers/jdbc/PreparedStatement.cxx|2 - cppuhelper/source/component_context.cxx |2 - cui/source/dialogs/SpellDialog.cxx|2 - cui/source/dialogs/hldocntp.cxx |2 - cui/source/tabpages/autocdlg.cxx |2 - cui/source/tabpages/tpline.cxx|2 - dbaccess/source/core/dataaccess/databasedocument.cxx |2 - dbaccess/source/filter/xml/xmlHierarchyCollection.cxx |2 - dbaccess/source/ui/browser/brwctrlr.cxx |2 - dbaccess/source/ui/browser/sbagrid.cxx|2 - dbaccess/source/ui/relationdesign/RTableConnectionData.cxx|2 - desktop/source/migration/services/jvmfwk.cxx |2 - drawinglayer/source/primitive2d/controlprimitive2d.cxx|2 - drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx|2 - drawinglayer/source/primitive2d/svggradientprimitive2d.cxx|2 - drawinglayer/source/processor2d/vclprocessor2d.cxx|2 - editeng/source/editeng/impedit.cxx|4 +- editeng/source/editeng/impedit2.cxx |2 - editeng/source/editeng/impedit4.cxx |3 - editeng/source/misc/hangulhanja.cxx |2 - editeng/source/outliner/outliner.cxx |4 +- editeng/source/outliner/outlvw.cxx|2 - extensions/source/bibliography/toolbar.cxx|2 - extensions/source/propctrlr/eformspropertyhandler.cxx |2 - filter/source/graphicfilter/icgm/actimpr.cxx |2 - filter/source/msfilter/escherex.cxx |2 - filter/source/msfilter/svdfppt.cxx|2 - filter/source/xsltdialog/xmlfilterjar.cxx | 10 ++--- forms/source/component/imgprod.cxx|2 - formula/source/ui/dlg/formula.cxx |2 - framework/source/jobs/job.cxx |2 - framework/source/services/frame.cxx |4 +- framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |6 +-- framework/source/uiconfiguration/uiconfigurationmanager.cxx |6 +-- framework/source/uielement/uicommanddescription.cxx |2 - idlc/source/astinterface.cxx |2 - linguistic/source/lngsvcmgr.cxx |2 - oox/source/dump/oledumper.cxx |2 - oox/source/helper/storagebase.cxx |2 - oox/source/ole/vbacontrol.cxx |2 - oox/source/ole/vbaproject.cxx |2 - reportdesign/source/core/sdr/UndoAc
[Libreoffice-commits] core.git: canvas/source
canvas/source/cairo/cairo_canvashelper.cxx | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
New commits:
commit 78036f74fa74ee2552e79064660634e1342692ff
Author: Miklos Vajna
AuthorDate: Fri Aug 14 16:15:07 2020 +0200
Commit: Miklos Vajna
CommitDate: Fri Aug 14 18:39:39 2020 +0200
tdf#135094 cairo canvas: fix black slide containing a very small image
Don't paint when the area would be 0, that would not be visible anyway,
and the _cairo_matrix_to_pixman_matrix_offset() call would fail with
CAIRO_INT_STATUS_INVALID_MATRIX in _pixman_image_set_properties(),
failing the render of the whole slide.
Also, warn in case the painting fails, so the next time something
breaks, it's easier to find the problematic place.
[ No testcase, our tests are typically headless and currently
SvpSalGraphics::SupportsCairo() reports false, so this would be tricky
to test. ]
Change-Id: I7cdb9462ff8155232ea51abf321b365c2219575b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100743
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx
b/canvas/source/cairo/cairo_canvashelper.cxx
index 533953e12891..09a87e2ecc4c 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1177,10 +1177,23 @@ namespace cairocanvas
cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width,
aBitmapSize.Height );
cairo_clip( mpCairo.get() );
-if( bModulateColors )
-cairo_paint_with_alpha( mpCairo.get(),
renderState.DeviceColor[3] );
-else
-cairo_paint( mpCairo.get() );
+int nPixelWidth = std::round(rSize.Width * aMatrix.xx);
+int nPixelHeight = std::round(rSize.Height * aMatrix.yy);
+if (nPixelWidth > 0 && nPixelHeight > 0)
+{
+// Only render the image if it's at least 1x1 px sized.
+if (bModulateColors)
+cairo_paint_with_alpha(mpCairo.get(),
renderState.DeviceColor[3]);
+else
+{
+cairo_paint(mpCairo.get());
+if (cairo_status(mpCairo.get()) != CAIRO_STATUS_SUCCESS)
+{
+SAL_WARN("canvas.cairo", "cairo_paint() failed: " <<
cairo_status_to_string(
+
cairo_status(mpCairo.get(;
+}
+}
+}
cairo_restore( mpCairo.get() );
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sdatabase/02010100.xhp|2 +- source/text/shared/explorer/database/0502.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit af517d7410ea929897be53a4968135ef62881377 Author: Johnny_M AuthorDate: Fri Aug 14 13:10:28 2020 +0200 Commit: Olivier Hallot CommitDate: Fri Aug 14 19:33:16 2020 +0200 tdf#132643 Translate German section IDs Change-Id: Ic7cafb66f39dfb8d641507e20bbfc6ea4e704ed8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100735 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdatabase/02010100.xhp b/source/text/sdatabase/02010100.xhp index b3e64a4b4..504f4eeda 100644 --- a/source/text/sdatabase/02010100.xhp +++ b/source/text/sdatabase/02010100.xhp @@ -113,7 +113,7 @@ Remove tables To remove the table from Design View, click the upper border of the table window and display the context menu. You can use the Delete command to remove the table from the Design View. Another option is to press the Delete key. - + Move table and modify table size You can resize and arrange the tables according to your preferences. To move tables, drag the upper border to the desired position. Enlarge or reduce the size in which the table is displayed by positioning the mouse cursor on a border or on a corner and dragging the table until it is the desired size. diff --git a/source/text/shared/explorer/database/0502.xhp b/source/text/shared/explorer/database/0502.xhp index 7f65f5324..a624b18aa 100644 --- a/source/text/shared/explorer/database/0502.xhp +++ b/source/text/shared/explorer/database/0502.xhp @@ -43,7 +43,7 @@ If the Relation Design window is open, the selected tables cannot be modified, even in Table Design mode. This ensures that tables are not changed while the relations are being created. The selected tables are shown in the top area of the relation design view. You can close a table window through the context menu or with the Delete key. - + primary keys;inserting (Base) keys;primary keys (Base) external keys (Base) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ba2ab89681844ac4a06b493773f087eab7526847 Author: Johnny_M AuthorDate: Fri Aug 14 19:33:16 2020 +0200 Commit: Gerrit Code Review CommitDate: Fri Aug 14 19:33:16 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to af517d7410ea929897be53a4968135ef62881377 - tdf#132643 Translate German section IDs Change-Id: Ic7cafb66f39dfb8d641507e20bbfc6ea4e704ed8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100735 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 30948b9f503a..af517d7410ea 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 30948b9f503a6270edd2ead2dd13fe9085ab5076 +Subproject commit af517d7410ea929897be53a4968135ef62881377 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/atrfld.cxx |2 +-
sw/source/core/undo/undobj.cxx|4
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 14fd4b54113f884cfd6871aeff693734fc06224b
Author: Michael Stahl
AuthorDate: Fri Aug 14 16:35:32 2020 +0200
Commit: Michael Stahl
CommitDate: Fri Aug 14 19:39:54 2020 +0200
tdf#135457 sw: fix invalidation of SwXTextField
This was supposed to happen from SwNodes::ChgNode() when moving to the
undo nodes array.
There are fields with a range that contains other fields, when the outer
field's range is deleted, the contained field moves to the undo array
and its position is no longer valid to be given out by
SwXTextField::getAnchor().
(regression from c73b5e969b2f9abdb2b9191938ca30bec5af725d)
Change-Id: I38c8b3393a777ca8dc8739b5ca4233a7f124961e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100749
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index e13ea716932f..59b1f48e5d68 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -217,7 +217,7 @@ void SwFormatField::InvalidateField()
{
SwPtrMsgPoolItem const item(RES_REMOVE_UNO_OBJECT,
&static_cast(*this)); // cast to base class (void*)
-NotifyClients(&item, &item);
+CallSwClientNotify(sw::LegacyModifyHint{ &item, &item });
}
void SwFormatField::SwClientNotify( const SwModify& rModify, const SfxHint&
rHint )
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 9e043b1b1e23..18df69ee728c 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -868,6 +868,10 @@ void SwUndoSaveContent::DelContentIndex( const SwPosition&
rMark,
SwDoc* pDoc = rMark.nNode.GetNode().GetDoc();
+// if it's not in the doc array, probably missing some invalidation
somewhere
+assert(&rPoint.nNode.GetNodes() == &pDoc->GetNodes());
+assert(&rMark.nNode.GetNodes() == &pDoc->GetNodes());
+
::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
// 1. Footnotes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 47dee6d8696bc968c08b4717388c3af28d86f59e Author: Johnny_M AuthorDate: Fri Aug 14 19:56:32 2020 +0200 Commit: Gerrit Code Review CommitDate: Fri Aug 14 19:56:32 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to d4ab7e2e49c20e908bff6211c725e8711393382a - tdf#132643 Translate German section IDs Change-Id: If96b69983c3a8074d5c19b3c2ca5ace4312654a5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100736 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index af517d7410ea..d4ab7e2e49c2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit af517d7410ea929897be53a4968135ef62881377 +Subproject commit d4ab7e2e49c20e908bff6211c725e8711393382a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sdatabase/02010100.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d4ab7e2e49c20e908bff6211c725e8711393382a Author: Johnny_M AuthorDate: Fri Aug 14 13:28:59 2020 +0200 Commit: Olivier Hallot CommitDate: Fri Aug 14 19:56:32 2020 +0200 tdf#132643 Translate German section IDs Change-Id: If96b69983c3a8074d5c19b3c2ca5ace4312654a5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100736 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdatabase/02010100.xhp b/source/text/sdatabase/02010100.xhp index 504f4eeda..bc07b8a95 100644 --- a/source/text/sdatabase/02010100.xhp +++ b/source/text/sdatabase/02010100.xhp @@ -369,7 +369,7 @@ Formulating filter conditions - + When formulating filter conditions, various operators and commands are available to you. Apart from the relational operators, there are SQL-specific commands that query the content of database fields. If you use these commands in the $[officename] syntax, $[officename] automatically converts these into the corresponding SQL syntax via an internal parser. You can also enter the SQL command directly and bypass the internal parser. The following tables give an overview of the operators and commands: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/explorer/database/0503.xhp |2 +- source/text/shared/explorer/database/05030200.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4b573757567fefa17558bd6dfe4cf8473b992a53 Author: Johnny_M AuthorDate: Fri Aug 14 13:36:35 2020 +0200 Commit: Olivier Hallot CommitDate: Fri Aug 14 19:57:52 2020 +0200 tdf#132643 Translate German section IDs Change-Id: I5728d6ba114712996255a0864bc40da0e6c01443 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100737 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/explorer/database/0503.xhp b/source/text/shared/explorer/database/0503.xhp index aeb81332c..1fdc9ab3f 100644 --- a/source/text/shared/explorer/database/0503.xhp +++ b/source/text/shared/explorer/database/0503.xhp @@ -49,7 +49,7 @@ You can copy within the same database or between different databases. - + diff --git a/source/text/shared/explorer/database/05030200.xhp b/source/text/shared/explorer/database/05030200.xhp index fa54733e4..cbcf36a68 100644 --- a/source/text/shared/explorer/database/05030200.xhp +++ b/source/text/shared/explorer/database/05030200.xhp @@ -29,7 +29,7 @@ - + Apply columns In the data source explorer, you can copy a table by dragging and dropping the table onto the table container. The Apply columns dialog is the second window of the Copy table dialog. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e25645e9fcbc24fc6bf6a72dd105665de45bce25 Author: Johnny_M AuthorDate: Fri Aug 14 19:57:52 2020 +0200 Commit: Gerrit Code Review CommitDate: Fri Aug 14 19:57:52 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 4b573757567fefa17558bd6dfe4cf8473b992a53 - tdf#132643 Translate German section IDs Change-Id: I5728d6ba114712996255a0864bc40da0e6c01443 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100737 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d4ab7e2e49c2..4b573757567f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d4ab7e2e49c20e908bff6211c725e8711393382a +Subproject commit 4b573757567fefa17558bd6dfe4cf8473b992a53 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 59dfa57824ec31ec7349130757952ebca8b9d4d4 Author: Johnny_M AuthorDate: Fri Aug 14 19:58:48 2020 +0200 Commit: Gerrit Code Review CommitDate: Fri Aug 14 19:58:48 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to c11b6fd0e5cf07989ac85f6be1a36aaf3ad2a871 - tdf#132643 Translate German section IDs Change-Id: I2393923975cc4ff0d0dd7f708afda0ed55b5b1f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100738 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4b573757567f..c11b6fd0e5cf 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4b573757567fefa17558bd6dfe4cf8473b992a53 +Subproject commit c11b6fd0e5cf07989ac85f6be1a36aaf3ad2a871 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0110.xhp|2 +- source/text/shared/01/01100100.xhp|2 +- source/text/shared/explorer/database/0504.xhp |2 +- source/text/shared/explorer/database/05040200.xhp |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit c11b6fd0e5cf07989ac85f6be1a36aaf3ad2a871 Author: Johnny_M AuthorDate: Fri Aug 14 13:38:32 2020 +0200 Commit: Olivier Hallot CommitDate: Fri Aug 14 19:58:47 2020 +0200 tdf#132643 Translate German section IDs Change-Id: I2393923975cc4ff0d0dd7f708afda0ed55b5b1f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100738 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0110.xhp b/source/text/shared/01/0110.xhp index 323957087..7f18db291 100644 --- a/source/text/shared/01/0110.xhp +++ b/source/text/shared/01/0110.xhp @@ -39,7 +39,7 @@ The Properties dialog contains the following tab pages: - + diff --git a/source/text/shared/01/01100100.xhp b/source/text/shared/01/01100100.xhp index c4738d53b..8eec2c65b 100644 --- a/source/text/shared/01/01100100.xhp +++ b/source/text/shared/01/01100100.xhp @@ -25,7 +25,7 @@ - + Description diff --git a/source/text/shared/explorer/database/0504.xhp b/source/text/shared/explorer/database/0504.xhp index 751edc395..980095ca9 100644 --- a/source/text/shared/explorer/database/0504.xhp +++ b/source/text/shared/explorer/database/0504.xhp @@ -34,6 +34,6 @@ General - + diff --git a/source/text/shared/explorer/database/05040200.xhp b/source/text/shared/explorer/database/05040200.xhp index 22bf38e04..37db839f3 100644 --- a/source/text/shared/explorer/database/05040200.xhp +++ b/source/text/shared/explorer/database/05040200.xhp @@ -32,7 +32,7 @@ - + Description Table description ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/0220.xhp |2 +- source/text/shared/explorer/database/0500.xhp |2 +- source/text/shared/explorer/database/1109.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 106adba5b39e31415d2fccc4dfb38e7fefb3d0b6 Author: Johnny_M AuthorDate: Fri Aug 14 13:44:57 2020 +0200 Commit: Olivier Hallot CommitDate: Fri Aug 14 19:59:41 2020 +0200 tdf#132643 Translate German section IDs Change-Id: I745b5e1b19df017b8ffdff6b77959df4f297daf7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100739 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/0220.xhp b/source/text/scalc/01/0220.xhp index 0da5d929d..a8cb4735b 100644 --- a/source/text/scalc/01/0220.xhp +++ b/source/text/scalc/01/0220.xhp @@ -28,7 +28,7 @@ - + Sheet diff --git a/source/text/shared/explorer/database/0500.xhp b/source/text/shared/explorer/database/0500.xhp index bb3600017..e0429c3b0 100644 --- a/source/text/shared/explorer/database/0500.xhp +++ b/source/text/shared/explorer/database/0500.xhp @@ -32,7 +32,7 @@ - + Tables Table data edit mode allows you to see your data as rows of records, with optional filtering and sorting of that data. In this mode, you can also enter new records, make changes to, and delete existing records. diff --git a/source/text/shared/explorer/database/1109.xhp b/source/text/shared/explorer/database/1109.xhp index 099a16144..6b21741bf 100644 --- a/source/text/shared/explorer/database/1109.xhp +++ b/source/text/shared/explorer/database/1109.xhp @@ -29,7 +29,7 @@ - + Table FilterUFI: file remains as a help id container - no browsing Some databases track changes to each record by assigning version number to fields that are changed. This number is incremented by 1 each time the field is changed. Displays the internal version number of the record in the database table. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e7a791f87bb35f03219ba2df20be15ad8ea21a2 Author: Johnny_M AuthorDate: Fri Aug 14 19:59:41 2020 +0200 Commit: Gerrit Code Review CommitDate: Fri Aug 14 19:59:41 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 106adba5b39e31415d2fccc4dfb38e7fefb3d0b6 - tdf#132643 Translate German section IDs Change-Id: I745b5e1b19df017b8ffdff6b77959df4f297daf7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100739 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index c11b6fd0e5cf..106adba5b39e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c11b6fd0e5cf07989ac85f6be1a36aaf3ad2a871 +Subproject commit 106adba5b39e31415d2fccc4dfb38e7fefb3d0b6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/filter/ww8/wrtw8nds.cxx | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
New commits:
commit f8837995fab0a37e514fda53dd6c9cbcf34e5e6c
Author: Michael Stahl
AuthorDate: Wed Aug 12 17:07:18 2020 +0200
Commit: Caolán McNamara
CommitDate: Fri Aug 14 20:24:23 2020 +0200
sw: MS Word export: don't insert section breaks in field instructions
MSWordExportBase::NeedTextNodeSplit() simply uses the soft-page-break
positions to potentially insert section breaks - but now that Writer can
display field instructions, it's quite silly to insert section breaks
inside them.
Change-Id: Ie57e6281a0287aac36984e5467920852db19a8ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100661
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 68cc91cd2c461b7062c3f3b89b2c677e41c9a8d4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100529
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 763e4669..b520279b7345 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2162,7 +2162,29 @@ bool MSWordExportBase::NeedSectionBreak( const SwNode&
rNd ) const
bool MSWordExportBase::NeedTextNodeSplit( const SwTextNode& rNd,
SwSoftPageBreakList& pList ) const
{
-rNd.fillSoftPageBreakList( pList );
+SwSoftPageBreakList tmp;
+rNd.fillSoftPageBreakList(tmp);
+// hack: move the break behind any field marks; currently we can't hide the
+// field mark instruction so the layout position is quite meaningless
+IDocumentMarkAccess const& rIDMA(*rNd.GetDoc()->getIDocumentMarkAccess());
+sal_Int32 pos(-1);
+for (auto const& it : tmp)
+{
+if (pos < it) // previous one might have skipped over it
+{
+pos = it;
+while (auto const*const pMark =
rIDMA.getFieldmarkFor(SwPosition(const_cast(rNd), pos)))
+{
+if (pMark->GetMarkEnd().nNode != rNd)
+{
+pos = rNd.Len(); // skip everything
+break;
+}
+pos = pMark->GetMarkEnd().nContent.GetIndex(); // no +1, it's
behind the char
+}
+pList.insert(pos);
+}
+}
pList.insert(0);
pList.insert( rNd.GetText().getLength() );
return pList.size() > 2 && NeedSectionBreak( rNd );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests
cypress_test/integration_tests/common/helper.js| 18
---
cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js | 25
++
2 files changed, 29 insertions(+), 14 deletions(-)
New commits:
commit 6d239a3a9f2d096477f3a58a66e559dba27f6b88
Author: Tamás Zolnai
AuthorDate: Fri Aug 14 15:00:02 2020 +0200
Commit: Tamás Zolnai
CommitDate: Fri Aug 14 20:37:58 2020 +0200
cypress: improve selectTextOfShape() method.
Sometimes double clicking inside the shape does
not makes the shape to step into text editing mode.
To avoid this kind of issue, we can click more times
until we get the cursor.
Change-Id: I4a9671c299144bd8ca250b575665538ab14758ad
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100755
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git
a/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
b/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
index 90702bd90..1f197e3ba 100644
--- a/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
+++ b/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
@@ -25,14 +25,23 @@ function selectTextShapeInTheCenter() {
function selectTextOfShape() {
// Double click onto the selected shape
- cy.get('svg g .leaflet-interactive')
- .then(function(items) {
- expect(items).to.have.length(1);
- var XPos = (items[0].getBoundingClientRect().left +
items[0].getBoundingClientRect().right) / 2;
- var YPos = (items[0].getBoundingClientRect().top +
items[0].getBoundingClientRect().bottom) / 2;
- cy.get('body')
- .dblclick(XPos, YPos);
- });
+ cy.waitUntil(function() {
+ cy.get('svg g .leaflet-interactive')
+ .then(function(items) {
+ expect(items).to.have.length(1);
+ var XPos =
(items[0].getBoundingClientRect().left +
items[0].getBoundingClientRect().right) / 2;
+ var YPos =
(items[0].getBoundingClientRect().top +
items[0].getBoundingClientRect().bottom) / 2;
+ cy.get('body')
+ .dblclick(XPos, YPos);
+ });
+
+ cy.wait(2000);
+
+ return cy.get('.leaflet-overlay-pane')
+ .then(function(overlay) {
+ return
overlay.children('.leaflet-cursor-container').length !== 0;
+ });
+ });
cy.get('.leaflet-cursor.blinking-cursor')
.should('exist');
commit 0134d74b4532dc6514567c4ee37a1002e827314e
Author: Tamás Zolnai
AuthorDate: Fri Aug 14 14:45:52 2020 +0200
Commit: Tamás Zolnai
CommitDate: Fri Aug 14 20:37:47 2020 +0200
cypress: improve typeIntoDocument() method.
Change-Id: I9e28a44a42596624c6c40984581e97679fad63b3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100754
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/common/helper.js
b/cypress_test/integration_tests/common/helper.js
index 8596246bc..8113ee55e 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -509,17 +509,23 @@ function moveCursor(direction) {
}
function typeIntoDocument(text) {
- cy.get('textarea.clipboard')
- .focus();
+ cy.log('Typing into document - start.');
- cy.document().its('activeElement.tagName')
- .should('be.eq', 'TEXTAREA');
+ cy.document()
+ .then(function(doc) {
+ if (doc.activeElement.className !== 'clipboard') {
+ cy.get('textarea.clipboard')
+ .focus();
- cy.document().its('activeElement.className')
- .should('be.eq', 'clipboard');
+ cy.document().its('activeElement.className')
+ .should('be.eq', 'clipboard');
+ }
+ });
cy.get('textarea.clipboard')
.type(text, {force: true});
+
+ cy.log('Typing into document - end.');
}
module.exports.loadTestDoc = loadTestDoc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests
cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js | 28
+-
1 file changed, 16 insertions(+), 12 deletions(-)
New commits:
commit 15444dbf33fdd5d045c7e9fd5128fe323977a1bf
Author: Tamás Zolnai
AuthorDate: Fri Aug 14 16:31:31 2020 +0200
Commit: Tamás Zolnai
CommitDate: Fri Aug 14 20:44:39 2020 +0200
cypress: improve removeShapeSelection() method.
Instead of using a click() and a dblclick() method, do
click() repeatedly, until selection is actually removed.
For example, it takes ony click when the shape is selected,
but no text is selected inside it. It takes two clicks when
a text also selected and sometimes when selection stucks it
takes even more click.
Change-Id: Ic017d0f5b623de29343cf171a8f4d64988fdb721
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100756
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git
a/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
b/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
index 1f197e3ba..6341caa96 100644
--- a/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
+++ b/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
@@ -50,19 +50,23 @@ function selectTextOfShape() {
}
function removeShapeSelection() {
- // Remove selection first with clicking next to the rotate handler
- cy.get('.transform-handler--rotate')
- .then(function(items) {
- var XPos = items[0].getBoundingClientRect().left - 10;
- var YPos = items[0].getBoundingClientRect().top;
- // Sometimes selection is persistent, so click more
times
- // to achive actual deselection.
- cy.get('body')
- .click(XPos, YPos);
+ // Remove selection with on the top-left corner of the slide
+ cy.waitUntil(function() {
+ cy.get('.leaflet-tile')
+ .then(function(items) {
+ var XPos =
items[0].getBoundingClientRect().left + 10;
+ var YPos = items[0].getBoundingClientRect().top
+ 10;
+ cy.get('body')
+ .click(XPos, YPos);
+ });
- cy.get('body')
- .dblclick(XPos, YPos);
- });
+ cy.wait(2000);
+
+ return cy.get('.leaflet-zoom-animated')
+ .then(function(overlay) {
+ return overlay.children('g').length === 0;
+ });
+ });
cy.get('.leaflet-drag-transform-marker')
.should('not.exist');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests
cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js | 16
++
1 file changed, 16 insertions(+)
New commits:
commit 8d3209dd1e49edbc1c0d6551347dd1a461d510b7
Author: Tamás Zolnai
AuthorDate: Fri Aug 14 16:33:34 2020 +0200
Commit: Tamás Zolnai
CommitDate: Fri Aug 14 21:33:39 2020 +0200
cypress: add log lines to impress helper methods.
Change-Id: I64289fa556e12142400bca07ff9d45f2b2df72cd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100757
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git
a/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
b/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
index 6341caa96..62202bc4e 100644
--- a/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
+++ b/cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js
@@ -3,6 +3,8 @@
var helper = require('../../common/helper');
function selectTextShapeInTheCenter() {
+ cy.log('Selecting text shape - start.');
+
// Click on the center of the slide to select the text shape there
cy.get('#document-container')
.then(function(items) {
@@ -21,9 +23,13 @@ function selectTextShapeInTheCenter() {
expect(shape.hasClass('com.sun.star.drawing.TextShape')
||
shape.hasClass('Outline')).to.be.true;
});
+
+ cy.log('Selecting text shape - end.');
}
function selectTextOfShape() {
+ cy.log('Selecting text of shape - start.');
+
// Double click onto the selected shape
cy.waitUntil(function() {
cy.get('svg g .leaflet-interactive')
@@ -47,9 +53,13 @@ function selectTextOfShape() {
.should('exist');
helper.selectAllText(false);
+
+ cy.log('Selecting text of shape - end.');
}
function removeShapeSelection() {
+ cy.log('Removing shape selection - start.');
+
// Remove selection with on the top-left corner of the slide
cy.waitUntil(function() {
cy.get('.leaflet-tile')
@@ -70,9 +80,13 @@ function removeShapeSelection() {
cy.get('.leaflet-drag-transform-marker')
.should('not.exist');
+
+ cy.log('Removing shape selection - end.');
}
function triggerNewSVGForShapeInTheCenter() {
+ cy.log('Triggering new SVG for shape - start.');
+
removeShapeSelection();
// If we click too fast on the shape again
@@ -81,6 +95,8 @@ function triggerNewSVGForShapeInTheCenter() {
// Select text shape again which will retrigger a new SVG from core
selectTextShapeInTheCenter();
+
+ cy.log('Triggering new SVG for shape - end.');
}
module.exports.selectTextShapeInTheCenter = selectTextShapeInTheCenter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.Menubar.js | 10 ---
loleaflet/src/control/Control.MobileWizard.js | 25 +++---
loleaflet/src/control/Control.Toolbar.js | 35 +++---
loleaflet/src/control/Control.UIManager.js| 25 +-
4 files changed, 61 insertions(+), 34 deletions(-)
New commits:
commit fbfc1f4d2c5fb9e0383cfb681efe7bbe82211f03
Author: Szymon Kłos
AuthorDate: Thu Aug 6 12:32:55 2020 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 21:50:38 2020 +0200
Handle back button on mobile
This patch created states in history when using
mobilewizard, allows to use back button which navigates
back in the menu.
Used History API and popstate event.
Also unified onClose handler to close the app.
Change-Id: Id9da9bf71ee6183525ea20d43a416d3ddabec7c2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100301
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index f08d5d966..bb868473f 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1218,15 +1218,7 @@ L.Control.Menubar = L.Control.extend({
this._map.fire('postMessage', {msgId: 'rev-history',
args: {Deprecated: true}});
this._map.fire('postMessage', {msgId:
'UI_FileVersions'});
} else if (id === 'closedocument') {
- if (window.ThisIsAMobileApp) {
- window.postMobileMessage('BYE');
- } else {
- this._map.fire('postMessage', {msgId: 'close',
args: {EverModified: this._map._everModified, Deprecated: true}});
- this._map.fire('postMessage', {msgId:
'UI_Close', args: {EverModified: this._map._everModified}});
- }
- if (!this._map._disableDefaultAction['UI_Close']) {
- this._map.remove();
- }
+ window.onClose();
} else if (id === 'repair') {
this._map._socket.sendMessage('commandvalues
command=.uno:DocumentRepair');
} else if (id === 'searchdialog') {
diff --git a/loleaflet/src/control/Control.MobileWizard.js
b/loleaflet/src/control/Control.MobileWizard.js
index 4a4a1eba2..853dfe333 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -11,6 +11,7 @@ L.Control.MobileWizard = L.Control.extend({
_inMainMenu: true,
_isActive: false,
+ _inBuilding: false,
_currentDepth: 0,
_mainTitle: '',
_isTabMode: false,
@@ -57,10 +58,9 @@ L.Control.MobileWizard = L.Control.extend({
},
_setupBackButton: function() {
- var that = this;
this.content = $('#mobile-wizard-content');
this.backButton = $('#mobile-wizard-back');
- this.backButton.click(function() { that.goLevelUp(); });
+ this.backButton.click(function() { history.back(); });
$(this.backButton).addClass('close-button');
},
@@ -130,6 +130,10 @@ L.Control.MobileWizard = L.Control.extend({
this._updateMapSize();
},
+ isOpen: function() {
+ return $('#mobile-wizard').is(':visible');
+ },
+
_hideKeyboard: function() {
document.activeElement.blur();
},
@@ -191,6 +195,8 @@ L.Control.MobileWizard = L.Control.extend({
$(contentToShow).show();
this._currentDepth++;
+ if (!this._inBuilding)
+ history.pushState({context: 'mobile-wizard', level:
this._currentDepth}, 'mobile-wizard-level-' + this._currentDepth);
this._setTitle(contentToShow.title);
this._inMainMenu = false;
@@ -314,6 +320,8 @@ L.Control.MobileWizard = L.Control.extend({
_onMobileWizard: function(data) {
if (data) {
+ this._inBuilding = true;
+
var isSidebar = (data.children && data.children.length
>= 1 &&
data.children[0].type == 'deck');
@@ -325,14 +333,15 @@ L.Control.MobileWizard = L.Control.extend({
return;
}
- if (data.id && !isNaN(data.id) && !isSidebar) {
+ var isMobileDialog = data.id && !isNaN(data.id) &&
!isSidebar;
+ if (isMobileDialog) {
// id is a number - remember window id for
interaction
window.mobileDialogId = data.id;
}
/
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - android/lib loleaflet/css loleaflet/src
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java | 15
+++
loleaflet/css/toolbar.css|1
loleaflet/src/control/Control.MobileTopBar.js|2
loleaflet/src/control/Control.Toolbar.js |8 +++
loleaflet/src/control/Control.UIManager.js | 21
+-
loleaflet/src/control/Permission.js |6 ++
loleaflet/src/map/Map.js |5 ++
7 files changed, 55 insertions(+), 3 deletions(-)
New commits:
commit 2e591af0322535e08bd4c2f3ad459e4e471f772a
Author: mert
AuthorDate: Wed Feb 12 20:53:34 2020 +0300
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 21:53:46 2020 +0200
android: back button switches to readonly mode instead of closing
Currently pressing back button on edit mode closes the document,
this patch may prevent unintentional touches
Change-Id: Ic7061186fa8794203fd4614c07a11b219d3a10d9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100666
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-by: Jan Holesovsky
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 24319e215..c131a983f 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -122,6 +122,7 @@ public class LOActivity extends AppCompatActivity {
/** In case the mobile-wizard is visible, we have to intercept the
Android's Back button. */
private boolean mMobileWizardVisible = false;
+private boolean mIsEditModeActive = false;
private ValueCallback valueCallback;
@@ -693,6 +694,9 @@ public class LOActivity extends AppCompatActivity {
// just return one level up in the mobile-wizard (or close it)
callFakeWebsocketOnMessage("'mobile: mobilewizardback'");
return;
+} else if (mIsEditModeActive) {
+callFakeWebsocketOnMessage("'mobile: readonlymode'");
+return;
}
finishWithProgress();
@@ -924,6 +928,17 @@ public class LOActivity extends AppCompatActivity {
startActivity(intent);
return false;
}
+case "EDITMODE": {
+switch (messageAndParam[1]) {
+case "on":
+mIsEditModeActive = true;
+break;
+case "off":
+mIsEditModeActive = false;
+break;
+}
+return false;
+}
}
return true;
}
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 604120e54..aed7e7e2b 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -710,6 +710,7 @@ button.leaflet-control-search-next
.w2ui-icon.users{ background: url('images/contacts-dark.svg') no-repeat
center; }
.w2ui-icon.fullscreen{ background: url('images/lc_fullscreen.svg') no-repeat
center !important; }
.w2ui-icon.closemobile{ background: url('images/lc_closedocmobile.svg')
no-repeat center !important; }
+.w2ui-icon.editmode { background: url("images/lc_listitem-selected.svg")
no-repeat center / 28px !important; }
.w2ui-icon.closetoolbar{ background: url('images/close_toolbar.svg') no-repeat
center !important; }
.w2ui-icon.sidebar_modify_page{ background:
url('images/lc_formproperties.svg') no-repeat center !important; }
.w2ui-icon.sidebar_slide_change{ background:
url('images/sidebar-transition-large.svg') no-repeat center !important; }
diff --git a/loleaflet/src/control/Control.MobileTopBar.js
b/loleaflet/src/control/Control.MobileTopBar.js
index d754f0a19..d7f259893 100644
--- a/loleaflet/src/control/Control.MobileTopBar.js
+++ b/loleaflet/src/control/Control.MobileTopBar.js
@@ -193,6 +193,7 @@ L.Control.MobileTopBar = L.Control.extend({
toolbarDownButtons.forEach(function(id) {
toolbar.enable(id);
});
+ toolbar.set('closemobile', {img: 'editmode'});
}
} else {
toolbar = w2ui['actionbar'];
@@ -200,6 +201,7 @@ L.Control.MobileTopBar = L.Control.extend({
toolbarDownButtons.forEach(function(id) {
toolbar.disable(id);
});
+ toolbar.set('closemobile', {img:
'closemobile'});
}
}
},
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index c1580f8d4..bc2
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/managechangessidebar.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e345575334cdff0eb218c4e4a7b6f6e6d0ab9e5f Author: Julien Nabet AuthorDate: Fri Aug 14 21:29:21 2020 +0200 Commit: Julien Nabet CommitDate: Fri Aug 14 22:10:08 2020 +0200 tdf#135755: Crash:right click to Manage Changes List on side bar bt here: https://bugs.documentfoundation.org/attachment.cgi?id=164318&action=edit Change-Id: I0874cf9bea1e28192e94ea6125ca6ac8f5736c30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100759 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sw/uiconfig/swriter/ui/managechangessidebar.ui b/sw/uiconfig/swriter/ui/managechangessidebar.ui index 7fc15bf6f67a..5befb6d0488e 100644 --- a/sw/uiconfig/swriter/ui/managechangessidebar.ui +++ b/sw/uiconfig/swriter/ui/managechangessidebar.ui @@ -166,7 +166,7 @@ Sort By True - + True False ___ 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.2' - svx/source
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 57d63ffb2f071e4fbb7d358557c1cb6aa54464b7
Author: Szymon Kłos
AuthorDate: Tue Aug 11 10:28:52 2020 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 22:40:32 2020 +0200
Instant update shadow fields in sidebar
This allows mobile LOK client to receive updated
state.
Change-Id: I07fb397c1566546e6e2eb8071eaf6d848f6effc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100466
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index a3c40a649db2..fc2b7ccd69bc 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
using namespace css;
using namespace css::uno;
@@ -141,12 +142,27 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl,
Button*, void)
SdrOnOffItem aItem(makeSdrShadowItem(false));
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
SfxCallMode::RECORD, { &aItem });
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+mpShowShadow->SetState( TRISTATE_FALSE );
+UpdateControls();
+}
}
else
{
SdrOnOffItem aItem(makeSdrShadowItem(true));
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
SfxCallMode::RECORD, { &aItem });
+
+if (mpShadowDistance->GetValue( FieldUnit::POINT ) == 0)
+mpShadowDistance->SetValue( 8, FieldUnit::POINT );
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+mpShowShadow->SetState( TRISTATE_TRUE );
+UpdateControls();
+}
}
}
___
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.2' - include/vcl vcl/source
include/vcl/combobox.hxx|3 +++
vcl/source/control/combobox.cxx | 29 +
2 files changed, 32 insertions(+)
New commits:
commit 0c9c1bcbeb937ac9fae785b9f890de18ccbf3e28
Author: Szymon Kłos
AuthorDate: Tue Feb 25 13:01:20 2020 +0100
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 22:40:55 2020 +0200
jsdialog: export combobox entries
Change-Id: Ic0a3c93020c7c915fd908fe994ec0a3a900358eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97625
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100469
Reviewed-by: Jan Holesovsky
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 9dc14739f4e1..62569fc8d0c1 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#define COMBOBOX_APPEND (SAL_MAX_INT32)
#define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32)
@@ -183,6 +184,8 @@ public:
virtual bool set_property(const OString &rKey, const OUString &rValue)
override;
virtual FactoryFunction GetUITestFactory() const override;
+
+virtual boost::property_tree::ptree DumpAsPropertyTree() override;
};
#endif // _COMBOBOX_HXX
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 99203e61b793..944860e0ca74 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1562,4 +1562,33 @@ FactoryFunction ComboBox::GetUITestFactory() const
return ComboBoxUIObject::create;
}
+boost::property_tree::ptree ComboBox::DumpAsPropertyTree()
+{
+boost::property_tree::ptree aTree(Control::DumpAsPropertyTree());
+boost::property_tree::ptree aEntries;
+
+for (int i = 0; i < GetEntryCount(); ++i)
+{
+boost::property_tree::ptree aEntry;
+aEntry.put("", GetEntry(i));
+aEntries.push_back(std::make_pair("", aEntry));
+}
+
+aTree.add_child("entries", aEntries);
+
+boost::property_tree::ptree aSelected;
+
+for (int i = 0; i < GetSelectedEntryCount(); ++i)
+{
+boost::property_tree::ptree aEntry;
+aEntry.put("", GetSelectedEntryPos(i));
+aSelected.push_back(std::make_pair("", aEntry));
+}
+
+aTree.put("selectedCount", GetSelectedEntryCount());
+aTree.add_child("selectedEntries", aSelected);
+
+return aTree;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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.2' - vcl/source
vcl/source/control/combobox.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 769fc49f87ccfd1858da4cddab09d978ff19df5a
Author: Szymon Kłos
AuthorDate: Wed Jul 8 13:52:43 2020 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 22:41:57 2020 +0200
Call modified handler on combobox selection
SelectEntryPos is used by uitest framework
to perform combobox selection action.
Calling handler is required to propagate
changes to the client code.
Change-Id: I83d3d72ee5f17f382ce5f56b35b0a91ec98ebfb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98370
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100470
Reviewed-by: Jan Holesovsky
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 944860e0ca74..227856bee234 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -453,7 +453,10 @@ IMPL_LINK( ComboBox::Impl, ImplSelectionChangedHdl,
sal_Int32, nChanged, void )
if (!m_pImplLB->IsTrackingSelect())
{
if (!m_pSubEdit->IsReadOnly() &&
m_pImplLB->GetEntryList()->IsEntryPosSelected(nChanged))
+{
m_pSubEdit->SetText(m_pImplLB->GetEntryList()->GetEntryText(nChanged));
+m_pSubEdit->Modify();
+}
}
}
___
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.2' - sc/source svx/sdi
sc/source/ui/drawfunc/drawsh.cxx |8
svx/sdi/svx.sdi |2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit c10f1254e250280227a33bb9c8045ce99bd092d5
Author: Szymon Kłos
AuthorDate: Tue Aug 11 15:14:23 2020 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 22:43:09 2020 +0200
Shadow color setter for online
Change-Id: Id79d879a6017beb39e95a8d923e8368178901c74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100502
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 70623818ef29..1b19748a584a 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -64,6 +64,7 @@
#include
#include
#include
+#include
SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
@@ -109,6 +110,13 @@ namespace
pArgs->Put(aFillColorItem);
break;
}
+
+case SID_ATTR_SHADOW_COLOR:
+{
+XColorItem aItem(SDRATTR_SHADOWCOLOR, aColor);
+pArgs->Put(aItem);
+break;
+}
}
}
if (SfxItemState::SET == pArgs->GetItemState(SID_FILL_GRADIENT_JSON,
false, &pItem))
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 36fe1d2e528d..2d8ef16ecae4 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7632,7 +7632,7 @@ SdrOnOffItem FillShadow SID_ATTR_FILL_SHADOW
]
XColorItem FillShadowColor SID_ATTR_SHADOW_COLOR
-
+(SfxStringItem Color SID_ATTR_COLOR_STR)
[
AutoUpdate = TRUE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css |2 +-
loleaflet/src/control/Control.JSDialogBuilder.js |6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 745bc47a0434e60854ab4f5b05c7ef16c0d74f6f
Author: Szymon Kłos
AuthorDate: Tue Aug 11 11:32:14 2020 +0200
Commit: Jan Holesovsky
CommitDate: Fri Aug 14 22:43:58 2020 +0200
mobile-wizard: improve calc shape shadow panel
- use listboxes
- reduce input to make space for -/+ controls
- working color selector
Change-Id: Ia9df4fbc09132474985d169d7b0d55985461ec2b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100472
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 8cba28d8e..177cf7877 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -700,7 +700,7 @@ a.leaflet-control-zoom-in {
#DecrementIndent + input:disabled{display: none;}
div#mobile-wizard-content input[type=number]{
height: 46px;
- width: 42%;
+ width: 40%;
padding-left: 8%;
border: none;
-moz-appearance: textfield;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 980ba21e7..00bcf2fd3 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1412,7 +1412,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (data.id === 'applystyle' ||
data.id === 'fontnamecombobox' ||
data.id === 'fontsizecombobox' ||
- data.id === 'FontBox') {
+ data.id === 'FontBox' ||
+ data.id === 'LB_ANGLE' ||
+ data.id === 'LB_DISTANCE') {
builder._listboxControl(parentContainer, data, builder);
} else if (data.id === 'searchterm' ||
data.id === 'replaceterm') {
@@ -1765,6 +1767,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
builder.map['stateChangeHandler'].setItemValue(data.command,
params[data.id].value);
builder.map.sendUnoCommand(data.command, params);
return;
+ } else if (data.id === 'LB_SHADOW_COLOR') {
+ data.command = '.uno:FillShadowColor';
}
var command = data.command + '?Color:string=' + color;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee0787d804a9090639fad4eef55f89ce9ec4a3f3 Author: Olivier Hallot AuthorDate: Fri Aug 14 18:54:44 2020 -0300 Commit: Gerrit Code Review CommitDate: Fri Aug 14 23:54:44 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 5bbeaa6e676b2ce465f8b05c09bfa483aef2c40e - tdf#135686 Refactor TSA Help page + other refactoring in Options Change-Id: Idb0fe9dbf335f37d41cf2f7e43c8f4ff96dfd819 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100761 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 106adba5b39e..5bbeaa6e676b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 106adba5b39e31415d2fccc4dfb38e7fefb3d0b6 +Subproject commit 5bbeaa6e676b2ce465f8b05c09bfa483aef2c40e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_shared.mk source/auxiliary source/text
AllLangHelp_shared.mk |2 source/auxiliary/shared.tree | 10 +- source/text/shared/00/0001.xhp |8 +- source/text/shared/01/05200200.xhp | 30 +++- source/text/shared/01/ref_pdf_export_digital_signature.xhp |6 - source/text/shared/01/timestampauth.xhp| 48 + source/text/shared/02/namedialog.xhp | 27 +++ source/text/shared/optionen/0100.xhp | 33 source/text/shared/optionen/01030300.xhp |7 - 9 files changed, 121 insertions(+), 50 deletions(-) New commits: commit 5bbeaa6e676b2ce465f8b05c09bfa483aef2c40e Author: Olivier Hallot AuthorDate: Fri Aug 14 18:48:38 2020 -0300 Commit: Olivier Hallot CommitDate: Fri Aug 14 23:54:44 2020 +0200 tdf#135686 Refactor TSA Help page + other refactoring in Options Change-Id: Idb0fe9dbf335f37d41cf2f7e43c8f4ff96dfd819 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100761 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 92c720da5..2f757db99 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -372,6 +372,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/signexistingpdf \ helpcontent2/source/text/shared/01/securitywarning \ helpcontent2/source/text/shared/01/selectcertificate \ +helpcontent2/source/text/shared/01/timestampauth \ helpcontent2/source/text/shared/01/webhtml \ helpcontent2/source/text/shared/01/xformsdata \ helpcontent2/source/text/shared/01/xformsdataadd \ @@ -516,6 +517,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/02/flowcharts \ helpcontent2/source/text/shared/02/fontwork \ helpcontent2/source/text/shared/02/limit \ +helpcontent2/source/text/shared/02/namedialog \ helpcontent2/source/text/shared/02/paintbrush \ helpcontent2/source/text/shared/02/querypropdlg \ helpcontent2/source/text/shared/02/stars \ diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree index 3e0efb2e6..fabd5d58a 100644 --- a/source/auxiliary/shared.tree +++ b/source/auxiliary/shared.tree @@ -41,18 +41,19 @@ Options User Data General -Paths -Writing Aids -General -Fonts View Print Options +Paths +Fonts +Security Application Colors Accessibility Advanced Expert Configuration Basic IDE OpenCL +Writing Aids +General Load/Save options Internet options Text Document Options @@ -108,6 +109,7 @@ About Digital Signatures Applying Digital Signatures Digital Signatures in PDF Exports +Time Stamp Authorities Signing Existing PDFs Adding Signature Lines in Text Documents Signing Signature Lines in Text Documents diff --git a/source/text/shared/00/0001.xhp b/source/text/shared/00/0001.xhp index 22a53eefe..6c83e692d 100644 --- a/source/text/shared/00/0001.xhp +++ b/source/text/shared/00/0001.xhp @@ -260,10 +260,12 @@ Options dialog buttons OK - Save the changes in the page and close the Options dialog. +Save the changes in the page and close the Options dialog. Cancel - Close the Options dialog and discard all changes done. - +Close the Options dialog and discard all changes done. +Apply +Applies the modified or selected values without closing the Options dialog. + Some options cannot be reset once edited. Either edit back the changes manually or click Cancel and reopen the Options dialog. diff --git a/source/text/shared/01/05200200.xhp b/source/text/shared/01/05200200.xhp index 24a6feb0b..9d7192573 100644 --- a/source/text/shared/01/05200200.xhp +++ b/source/text/shared/01/05200200.xhp @@ -30,50 +30,46 @@ -Line Styles +Line Styles Edit or create dashed or dotted line styles. -Properties +Properties -Line style +Line style Select the style of line that you want to create. -Type +Type Select the combination of dashes and dots that you want. -Number +Number Enter the number of times that you want a dot or a dash to appear in a sequence. -Length +Length Enter the length of the dash. -Spacing +Spacing Enter the amount of space that you want to leave between dots or dashes. -Fit to line width +Fit to line width Automatically adjusts the entries relative to the length of the line. -Add -Creates a new line style using the current settings. - - -Name -Enter a name. +Add +Creates a new line style using the current settings. Enter a name for the new line style. -Modify +Modify Updates the selected line style using the current settings. To change the name of the selected line style, enter a new name when
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/res/lx03245.png |binary icon-themes/colibre/res/lx03246.png |binary icon-themes/colibre/res/lx03247.png |binary icon-themes/colibre/res/lx03248.png |binary icon-themes/colibre/res/lx03249.png |binary icon-themes/colibre/res/lx03250.png |binary icon-themes/colibre/res/lx03251.png |binary icon-themes/colibre/res/lx03255.png |binary icon-themes/colibre_svg/res/lx03245.svg |1 + icon-themes/colibre_svg/res/lx03246.svg |1 + icon-themes/colibre_svg/res/lx03247.svg |1 + icon-themes/colibre_svg/res/lx03248.svg |1 + icon-themes/colibre_svg/res/lx03249.svg |1 + icon-themes/colibre_svg/res/lx03250.svg |1 + icon-themes/colibre_svg/res/lx03251.svg |1 + icon-themes/colibre_svg/res/lx03255.svg |1 + 16 files changed, 8 insertions(+) New commits: commit 4708fa80ac95f11bfbfd422bec52865a17b46fd9 Author: Rizal Muttaqin AuthorDate: Fri Aug 14 14:21:26 2020 +0300 Commit: Rizal Muttaqin CommitDate: Fri Aug 14 23:59:22 2020 +0200 Restore required resource in Colibre theme Regression after 56d5531373cf0588e02c254ea8ffa00221c8342b The missing "lx03249" caused failure in ImplImage::getSizePixel when exiting from presentation mode in Impress: assert(maBitmapChecksum == 0); when res/lx03249.png couldn't be loaded; the resource is referenced as BMP_OO_IMPRESS_DOC_LC in svtools/inc/bitmaps.hlst. Neccessary icons added. Change-Id: Iab240a4587e1aa1ff44b3478a029756db4b4da43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100734 Reviewed-by: Mike Kaganski Tested-by: Jenkins diff --git a/icon-themes/colibre/res/lx03245.png b/icon-themes/colibre/res/lx03245.png new file mode 100644 index ..c525f1be8cf5 Binary files /dev/null and b/icon-themes/colibre/res/lx03245.png differ diff --git a/icon-themes/colibre/res/lx03246.png b/icon-themes/colibre/res/lx03246.png new file mode 100644 index ..a79d8cdaa9a5 Binary files /dev/null and b/icon-themes/colibre/res/lx03246.png differ diff --git a/icon-themes/colibre/res/lx03247.png b/icon-themes/colibre/res/lx03247.png new file mode 100644 index ..b519709ecb92 Binary files /dev/null and b/icon-themes/colibre/res/lx03247.png differ diff --git a/icon-themes/colibre/res/lx03248.png b/icon-themes/colibre/res/lx03248.png new file mode 100644 index ..2eed96446f0a Binary files /dev/null and b/icon-themes/colibre/res/lx03248.png differ diff --git a/icon-themes/colibre/res/lx03249.png b/icon-themes/colibre/res/lx03249.png new file mode 100644 index ..037d68b4de7f Binary files /dev/null and b/icon-themes/colibre/res/lx03249.png differ diff --git a/icon-themes/colibre/res/lx03250.png b/icon-themes/colibre/res/lx03250.png new file mode 100644 index ..9b88046ca54c Binary files /dev/null and b/icon-themes/colibre/res/lx03250.png differ diff --git a/icon-themes/colibre/res/lx03251.png b/icon-themes/colibre/res/lx03251.png new file mode 100644 index ..e01a9ab638f8 Binary files /dev/null and b/icon-themes/colibre/res/lx03251.png differ diff --git a/icon-themes/colibre/res/lx03255.png b/icon-themes/colibre/res/lx03255.png new file mode 100644 index ..124a93885b55 Binary files /dev/null and b/icon-themes/colibre/res/lx03255.png differ diff --git a/icon-themes/colibre_svg/res/lx03245.svg b/icon-themes/colibre_svg/res/lx03245.svg new file mode 100644 index ..60dfb16073ff --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03245.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03246.svg b/icon-themes/colibre_svg/res/lx03246.svg new file mode 100644 index ..7d7c3cd4a37e --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03246.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03247.svg b/icon-themes/colibre_svg/res/lx03247.svg new file mode 100644 index ..605e1325ea27 --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03247.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03248.svg b/icon-themes/colibre_svg/res/lx03248.svg new file mode 100644 index ..a71328b590ba --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03248.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03249.svg b/icon-themes/colibre_svg/res/lx03249.svg new file mode 100644 index ..9e916c9c4148 --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03249.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03250.svg b/icon-themes/colibre_svg/res/lx03250.svg new file mode 100644 index ..6c04513bee52 --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03250
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 5de37de1c7e51443889979c06ad0bfbe1d3f5630
Author: gokaysatir
AuthorDate: Wed Aug 12 19:20:42 2020 +0300
Commit: Henry Castro
CommitDate: Sat Aug 15 00:01:06 2020 +0200
loleaflet mobile: Insert image: Make all items visible.
Change-Id: If479adf4a3b106676f9174669e3f7141bb23964d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100613
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 0f11a2b34..9b1b579af 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -792,21 +792,27 @@ button.leaflet-control-search-next
.insertshape-grid {
box-sizing: border-box;
background: rgba(255, 255, 255, 0.5);
- position: relative;
+ position: static;
padding: 2px;
- display: inline-block;
+ display: block;
min-width: 350px;
width: 100%;
- height: 100%;
+ height: auto;
}
.insertshape-grid .row {
- height: 30px;
+ height: auto;
+ position: static;
+ text-align: left;
+}
+
+.insertshape-grid .row:last-child {
+ box-sizing: content-box;
+ margin-bottom: 43px;
}
.insertshape-grid .col {
- height: 100%;
- float: left;
+ height: 30px;
padding: 2px;
width: 30px;
border: 1px solid transparent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/res/lx03245.png |binary icon-themes/colibre/res/lx03246.png |binary icon-themes/colibre/res/lx03247.png |binary icon-themes/colibre/res/lx03248.png |binary icon-themes/colibre/res/lx03249.png |binary icon-themes/colibre/res/lx03250.png |binary icon-themes/colibre/res/lx03251.png |binary icon-themes/colibre/res/lx03255.png |binary icon-themes/colibre_svg/res/lx03245.svg |1 + icon-themes/colibre_svg/res/lx03246.svg |1 + icon-themes/colibre_svg/res/lx03247.svg |1 + icon-themes/colibre_svg/res/lx03248.svg |1 + icon-themes/colibre_svg/res/lx03249.svg |1 + icon-themes/colibre_svg/res/lx03250.svg |1 + icon-themes/colibre_svg/res/lx03251.svg |1 + icon-themes/colibre_svg/res/lx03255.svg |1 + 16 files changed, 8 insertions(+) New commits: commit 88b121d528a2a7b0b437a70cc4b534a53c0d1d87 Author: Rizal Muttaqin AuthorDate: Fri Aug 14 14:21:26 2020 +0300 Commit: Rizal Muttaqin CommitDate: Sat Aug 15 04:16:05 2020 +0200 Restore required resource in Colibre theme Regression after 56d5531373cf0588e02c254ea8ffa00221c8342b The missing "lx03249" caused failure in ImplImage::getSizePixel when exiting from presentation mode in Impress: assert(maBitmapChecksum == 0); when res/lx03249.png couldn't be loaded; the resource is referenced as BMP_OO_IMPRESS_DOC_LC in svtools/inc/bitmaps.hlst. Neccessary icons added. Change-Id: Iab240a4587e1aa1ff44b3478a029756db4b4da43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100734 Reviewed-by: Mike Kaganski Tested-by: Jenkins (cherry picked from commit 4708fa80ac95f11bfbfd422bec52865a17b46fd9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100708 Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/res/lx03245.png b/icon-themes/colibre/res/lx03245.png new file mode 100644 index ..c525f1be8cf5 Binary files /dev/null and b/icon-themes/colibre/res/lx03245.png differ diff --git a/icon-themes/colibre/res/lx03246.png b/icon-themes/colibre/res/lx03246.png new file mode 100644 index ..a79d8cdaa9a5 Binary files /dev/null and b/icon-themes/colibre/res/lx03246.png differ diff --git a/icon-themes/colibre/res/lx03247.png b/icon-themes/colibre/res/lx03247.png new file mode 100644 index ..b519709ecb92 Binary files /dev/null and b/icon-themes/colibre/res/lx03247.png differ diff --git a/icon-themes/colibre/res/lx03248.png b/icon-themes/colibre/res/lx03248.png new file mode 100644 index ..2eed96446f0a Binary files /dev/null and b/icon-themes/colibre/res/lx03248.png differ diff --git a/icon-themes/colibre/res/lx03249.png b/icon-themes/colibre/res/lx03249.png new file mode 100644 index ..037d68b4de7f Binary files /dev/null and b/icon-themes/colibre/res/lx03249.png differ diff --git a/icon-themes/colibre/res/lx03250.png b/icon-themes/colibre/res/lx03250.png new file mode 100644 index ..9b88046ca54c Binary files /dev/null and b/icon-themes/colibre/res/lx03250.png differ diff --git a/icon-themes/colibre/res/lx03251.png b/icon-themes/colibre/res/lx03251.png new file mode 100644 index ..e01a9ab638f8 Binary files /dev/null and b/icon-themes/colibre/res/lx03251.png differ diff --git a/icon-themes/colibre/res/lx03255.png b/icon-themes/colibre/res/lx03255.png new file mode 100644 index ..124a93885b55 Binary files /dev/null and b/icon-themes/colibre/res/lx03255.png differ diff --git a/icon-themes/colibre_svg/res/lx03245.svg b/icon-themes/colibre_svg/res/lx03245.svg new file mode 100644 index ..60dfb16073ff --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03245.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03246.svg b/icon-themes/colibre_svg/res/lx03246.svg new file mode 100644 index ..7d7c3cd4a37e --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03246.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03247.svg b/icon-themes/colibre_svg/res/lx03247.svg new file mode 100644 index ..605e1325ea27 --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03247.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03248.svg b/icon-themes/colibre_svg/res/lx03248.svg new file mode 100644 index ..a71328b590ba --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03248.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/res/lx03249.svg b/icon-themes/colibre_svg/res/lx03249.svg new file mode 100644 index ..9e916c9c4148 --- /dev/null +++ b/icon-themes/colibre_svg/res/lx03249.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_sv
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - extensions/source vcl/source
extensions/source/propctrlr/standardcontrol.cxx |8 ++--
vcl/source/window/builder.cxx |7 ++-
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 4acf7b7b03ed62cbea2b738c9dcfe3a8bdb36288
Author: Caolán McNamara
AuthorDate: Fri Aug 14 10:29:30 2020 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Aug 15 07:38:00 2020 +0200
tdf#135526 ranges overflowing to become negative
the properties panel uses huge min/maxes which can overflow
when the number of digits changes
Change-Id: Idbb998a065ce8f2b918fceea2076b794cbde3368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100696
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/extensions/source/propctrlr/standardcontrol.cxx
b/extensions/source/propctrlr/standardcontrol.cxx
index dc1891eab122..a9b422440932 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -327,9 +327,13 @@ namespace pcr
return getTypedControlWindow()->get_digits();
}
-void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16
_decimaldigits )
+void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 decimaldigits
)
{
-getTypedControlWindow()->set_digits( _decimaldigits );
+weld::MetricSpinButton* pControlWindow = getTypedControlWindow();
+int min, max;
+pControlWindow->get_range(min, max, FieldUnit::NONE);
+pControlWindow->set_digits(decimaldigits);
+pControlWindow->set_range(min, max, FieldUnit::NONE);
}
Optional< double > SAL_CALL ONumericControl::getMinValue()
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d15d3e668937..14d6cdeed6ce 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -321,7 +321,12 @@ namespace weld
int MetricSpinButton::ConvertValue(int nValue, FieldUnit eInUnit,
FieldUnit eOutUnit) const
{
-return vcl::ConvertValue(nValue, 0, m_xSpinButton->get_digits(),
eInUnit, eOutUnit);
+auto nRet = vcl::ConvertValue(nValue, 0, m_xSpinButton->get_digits(),
eInUnit, eOutUnit);
+if (nRet > SAL_MAX_INT32)
+nRet = SAL_MAX_INT32;
+else if (nRet < SAL_MIN_INT32)
+nRet = SAL_MIN_INT32;
+return nRet;
}
IMPL_LINK(MetricSpinButton, spin_button_input, int*, result, bool)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |9 +
writerfilter/source/dmapper/DomainMapper.cxx|5 +
writerfilter/source/dmapper/DomainMapper.hxx|2 ++
writerfilter/source/dmapper/GraphicImport.cxx |4 +++-
5 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 7cc353df4f0993228984fcda3efb2c9181dddafb
Author: Justin Luth
AuthorDate: Thu Aug 13 12:02:39 2020 +0300
Commit: Justin Luth
CommitDate: Sat Aug 15 08:28:20 2020 +0200
tdf#77794 writerfilter: compat15 - always bLayoutInCell
Based on observation (no documentation found),
MS Word 2013 ignores the actual value of LayoutInCell
and always considers it to be true. The UI shows it,
but it is grayed out when CompatibilityMode == 15.
The code's default value of bLayoutInCell is also true,
so compatMode only needs to be checked if the property
is actually set in the document.
I probably could have left off the IsInTable() check,
but decided to just be as safe as possible.
I assume it doesn't apply, but LayoutInCell sets
a IsFollowingTextFlow property - which might have
meaning outside of a table in SW - I don't know.
Change-Id: Ief073ea96c6c61efb3bcbbc11d114d739b04c3af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100651
Tested-by: Jenkins
Reviewed-by: László Németh
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap.odt
b/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap.odt
new file mode 100644
index ..145a6af8da34
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf135595_HFtableWrap.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 129b93882c68..3e415e25da18 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -102,6 +102,15 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf128197)
CPPUNIT_ASSERT_LESS(nHeight15, nHeight14);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf135595_HFtableWrap,
"tdf135595_HFtableWrap.odt")
+{
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+sal_Int32 nRowHeight = getXPath(pXmlDoc,
"//page[1]/header/tab/row/infos/bounds", "height").toInt32();
+// tdf#77794: always force bLayoutInCell from false to true for MSO2013+
+// The fly is supposed to be inside the cell. Before, height was 998. Now
it is 2839.
+CPPUNIT_ASSERT_MESSAGE("Image must be contained inside the table cell",
nRowHeight > 2000);
+}
+
DECLARE_OOXMLIMPORT_TEST(testTdf123622, "tdf123622.docx")
{
uno::Reference
XPropsRight(getShape(1),uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 1fa3d39a9b9b..b3cae27dd228 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3901,6 +3901,11 @@ StyleSheetTablePtr const &
DomainMapper::GetStyleSheetTable( )
return m_pImpl->GetStyleSheetTable( );
}
+SettingsTablePtr const & DomainMapper::GetSettingsTable()
+{
+return m_pImpl->GetSettingsTable();
+}
+
GraphicZOrderHelper* DomainMapper::graphicZOrderHelper()
{
if (zOrderHelper == nullptr)
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx
b/writerfilter/source/dmapper/DomainMapper.hxx
index d84638f75840..34066b95cff1 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -22,6 +22,7 @@
#include
#include "LoggedResources.hxx"
#include "PropertyMap.hxx"
+#include "SettingsTable.hxx"
#include
#include
@@ -103,6 +104,7 @@ public:
OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties,
bool bAlwaysCreate );
StyleSheetTablePtr const & GetStyleSheetTable( );
+SettingsTablePtr const & GetSettingsTable();
GraphicZOrderHelper* graphicZOrderHelper();
GraphicNamingHelper& GetGraphicNamingHelper();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index cf27a30c49f3..dde3e1adb3b7 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -625,7 +625,9 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
break;
case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
-m_pImpl->bLayoutInCell = nIntValue != 0;
+// Starting in MSO 2013, anchors are ALWAYS considered to be laid
out in table cell.
+m_pImpl->bLayoutInCell = nIntValue != 0 ||
+
(m_pImpl->rDomainMapper.GetSettingsTable()->GetWordCompatibilityMode() > 14 &&
m_pImpl->rDomainMapper.IsInTable());
break;
case NS_ooxml::LN_CT_Anchor_hidden:
