[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/ar/recundo.png |binary icon-themes/elementary/cmd/32/ar/redo.png|binary icon-themes/elementary/cmd/32/ar/undo.png|binary icon-themes/elementary/cmd/32/recundo.png|binary icon-themes/elementary/cmd/32/redo.png |binary icon-themes/elementary/cmd/32/undo.png |binary icon-themes/elementary/cmd/ar/lc_recundo.png |binary icon-themes/elementary/cmd/ar/lc_redo.png|binary icon-themes/elementary/cmd/ar/lc_undo.png|binary icon-themes/elementary/cmd/ar/sc_recundo.png |binary icon-themes/elementary/cmd/ar/sc_redo.png|binary icon-themes/elementary/cmd/ar/sc_undo.png|binary icon-themes/elementary/cmd/lc_recundo.png|binary icon-themes/elementary/cmd/lc_redo.png |binary icon-themes/elementary/cmd/lc_undo.png |binary icon-themes/elementary/cmd/sc_recundo.png|binary icon-themes/elementary/cmd/sc_redo.png |binary icon-themes/elementary/cmd/sc_undo.png |binary icon-themes/elementary_svg/cmd/32/ar/recundo.svg |2 +- icon-themes/elementary_svg/cmd/32/ar/redo.svg|2 +- icon-themes/elementary_svg/cmd/32/ar/undo.svg|2 +- icon-themes/elementary_svg/cmd/32/recundo.svg|2 +- icon-themes/elementary_svg/cmd/32/redo.svg |2 +- icon-themes/elementary_svg/cmd/32/undo.svg |2 +- icon-themes/elementary_svg/cmd/ar/lc_recundo.svg |2 +- icon-themes/elementary_svg/cmd/ar/lc_redo.svg|2 +- icon-themes/elementary_svg/cmd/ar/lc_undo.svg|2 +- icon-themes/elementary_svg/cmd/ar/sc_recundo.svg |2 +- icon-themes/elementary_svg/cmd/ar/sc_redo.svg|2 +- icon-themes/elementary_svg/cmd/ar/sc_undo.svg|2 +- icon-themes/elementary_svg/cmd/lc_recundo.svg|2 +- icon-themes/elementary_svg/cmd/lc_redo.svg |2 +- icon-themes/elementary_svg/cmd/lc_undo.svg |2 +- icon-themes/elementary_svg/cmd/sc_recundo.svg|2 +- icon-themes/elementary_svg/cmd/sc_redo.svg |2 +- icon-themes/elementary_svg/cmd/sc_undo.svg |2 +- 36 files changed, 18 insertions(+), 18 deletions(-) New commits: commit b5a1952d28607978fadec263c015c946a191 Author: Rizal Muttaqin AuthorDate: Sat Mar 6 16:57:01 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Mar 7 08:40:39 2021 +0100 elementary: tdf#140838 new Undo & Redo icons Change-Id: Id1fae6168de9c431c54b6b6c985a5cd3a6082531 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112056 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit d64ce9f3b239e87622dd5bf313476b503df730af) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112073 diff --git a/icon-themes/elementary/cmd/32/ar/recundo.png b/icon-themes/elementary/cmd/32/ar/recundo.png index fe9601da30b9..755cb0431141 100644 Binary files a/icon-themes/elementary/cmd/32/ar/recundo.png and b/icon-themes/elementary/cmd/32/ar/recundo.png differ diff --git a/icon-themes/elementary/cmd/32/ar/redo.png b/icon-themes/elementary/cmd/32/ar/redo.png index b859ed78d70b..84adfb4650df 100644 Binary files a/icon-themes/elementary/cmd/32/ar/redo.png and b/icon-themes/elementary/cmd/32/ar/redo.png differ diff --git a/icon-themes/elementary/cmd/32/ar/undo.png b/icon-themes/elementary/cmd/32/ar/undo.png index 6ff214c0e963..cc79e7f7722c 100644 Binary files a/icon-themes/elementary/cmd/32/ar/undo.png and b/icon-themes/elementary/cmd/32/ar/undo.png differ diff --git a/icon-themes/elementary/cmd/32/recundo.png b/icon-themes/elementary/cmd/32/recundo.png index 81cb6ceb1e3d..3a93c974135b 100644 Binary files a/icon-themes/elementary/cmd/32/recundo.png and b/icon-themes/elementary/cmd/32/recundo.png differ diff --git a/icon-themes/elementary/cmd/32/redo.png b/icon-themes/elementary/cmd/32/redo.png index 00e035ccbada..99b4b785e360 100644 Binary files a/icon-themes/elementary/cmd/32/redo.png and b/icon-themes/elementary/cmd/32/redo.png differ diff --git a/icon-themes/elementary/cmd/32/undo.png b/icon-themes/elementary/cmd/32/undo.png index 7990f7eed4f6..fa99b18c4078 100644 Binary files a/icon-themes/elementary/cmd/32/undo.png and b/icon-themes/elementary/cmd/32/undo.png differ diff --git a/icon-themes/elementary/cmd/ar/lc_recundo.png b/icon-themes/elementary/cmd/ar/lc_recundo.png index 9cbb86c4447b..be43f450e2d2 100644 Binary files a/icon-themes/elementary/cmd/ar/lc_recundo.png and b/icon-themes/elementary/cmd/ar/lc_recundo.png differ diff --git a/icon-themes/elementary/cmd/ar/lc_redo.png b/icon-themes/elementary/cmd/ar/lc_redo.png index 023036dc4f3c..a47eb9f287b7 100644 Binary files a/icon-themes/elementary/cmd/ar/lc_redo.png and b/icon-themes/elementary/cmd/ar/lc_redo.png differ diff --git a/icon-themes/elementary/cmd/ar/lc_undo.png b/icon-themes/elementary/cmd/ar/lc_undo.png index 2b6b5f39828b..78d2e1d530fc 100644 Binary files a/icon-themes/elementary/cmd/ar/lc_undo.png and b/icon-themes/elementary
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/repeat.png |binary icon-themes/elementary/cmd/lc_repeat.png |binary icon-themes/elementary/cmd/sc_repeat.png |binary icon-themes/elementary_svg/cmd/32/repeat.svg |2 +- icon-themes/elementary_svg/cmd/lc_repeat.svg |2 +- icon-themes/elementary_svg/cmd/sc_repeat.svg |2 +- 6 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 982c579fbe59812900f5d181eea0c9b7efa78a8a Author: Rizal Muttaqin AuthorDate: Sat Mar 6 17:35:20 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Mar 7 08:39:49 2021 +0100 elementary: related to tdf#140838 new Undo & Redo icons Change-Id: Ifc24f15cb876ce5676ff288a87b39b9a632dbcd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112057 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit 9eeb580f5c57918484baff74ca052a96ed1056b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112074 diff --git a/icon-themes/elementary/cmd/32/repeat.png b/icon-themes/elementary/cmd/32/repeat.png index 4ea563b64159..843d7c7c808a 100644 Binary files a/icon-themes/elementary/cmd/32/repeat.png and b/icon-themes/elementary/cmd/32/repeat.png differ diff --git a/icon-themes/elementary/cmd/lc_repeat.png b/icon-themes/elementary/cmd/lc_repeat.png index a3b48ec3d1e9..990623feaa6c 100644 Binary files a/icon-themes/elementary/cmd/lc_repeat.png and b/icon-themes/elementary/cmd/lc_repeat.png differ diff --git a/icon-themes/elementary/cmd/sc_repeat.png b/icon-themes/elementary/cmd/sc_repeat.png index 4979a22abc52..8734e70aa355 100644 Binary files a/icon-themes/elementary/cmd/sc_repeat.png and b/icon-themes/elementary/cmd/sc_repeat.png differ diff --git a/icon-themes/elementary_svg/cmd/32/repeat.svg b/icon-themes/elementary_svg/cmd/32/repeat.svg index 06119cc6c63c..5030906b9a32 100644 --- a/icon-themes/elementary_svg/cmd/32/repeat.svg +++ b/icon-themes/elementary_svg/cmd/32/repeat.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< path d="m5.492695 23c0-5 2.509931-9.5 9.176597-9.5h1.34" opacity=".8" stroke="url(#d)"/> \ No newline at end of file diff --git a/icon-themes/elementary_svg/cmd/lc_repeat.svg b/icon-themes/elementary_svg/cmd/lc_repeat.svg index 90232a7c0672..1d6963501b78 100644 --- a/icon-themes/elementary_svg/cmd/lc_repeat.svg +++ b/icon-themes/elementary_svg/cmd/lc_repeat.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/cmd/sc_repeat.svg b/icon-themes/elementary_svg/cmd/sc_repeat.svg index b5d1bc08b3ee..39c7c6eb8b60 100644 --- a/icon-themes/elementary_svg/cmd/sc_repeat.svg +++ b/icon-themes/elementary_svg/cmd/sc_repeat.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - 6 commits - basegfx/CppunitTest_basegfx.mk basegfx/test cui/source cui/uiconfig include/basegfx include/sfx2 include/vcl officecfg/
Rebased ref, commits from common ancestor:
commit 92d73591cf097f6ae5288b7ee6d86ae1838e90db
Author: Tomaž Vajngerl
AuthorDate: Sun Mar 7 13:48:39 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Mar 7 13:54:21 2021 +0900
vcl: add PNG writer based on libpng
Change-Id: I52ffd1b286162ee0dd9f694c4f3210385f71daf8
diff --git a/include/vcl/filter/PngImageWriter.hxx
b/include/vcl/filter/PngImageWriter.hxx
new file mode 100644
index ..5d90b5261be4
--- /dev/null
+++ b/include/vcl/filter/PngImageWriter.hxx
@@ -0,0 +1,35 @@
+/* -*- 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
+
+#pragma once
+
+namespace vcl
+{
+class VCL_DLLPUBLIC PngImageWriter
+{
+SvStream& mrStream;
+css::uno::Reference mxStatusIndicator;
+
+public:
+PngImageWriter(SvStream& rStream);
+
+virtual ~PngImageWriter() {}
+
+bool write(BitmapEx& rBitmap);
+};
+
+} // namespace vcl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ea4d86b26e57..38a4aa617ade 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -477,6 +477,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/filter/wmf/wmfexternal \
vcl/source/filter/wmf/wmfwr \
vcl/source/filter/png/PngImageReader \
+vcl/source/filter/png/PngImageWriter \
vcl/source/filter/png/pngread \
vcl/source/filter/png/pngwrite \
vcl/source/font/Feature \
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx
b/vcl/qa/cppunit/png/PngFilterTest.cxx
index 28e6c719f6fd..ed1a830138aa 100644
--- a/vcl/qa/cppunit/png/PngFilterTest.cxx
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -24,8 +24,11 @@
#include
#include
#include
+#include
#include
+#include
#include
+#include
using namespace css;
@@ -46,12 +49,57 @@ public:
}
void testPng();
+void testPngWriting();
CPPUNIT_TEST_SUITE(PngFilterTest);
CPPUNIT_TEST(testPng);
+CPPUNIT_TEST(testPngWriting);
CPPUNIT_TEST_SUITE_END();
};
+void PngFilterTest::testPngWriting()
+{
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+{
+SvStream& rStream = *aTempFile.GetStream(StreamMode::WRITE);
+Bitmap aBitmap(Size(16, 16), 24);
+{
+BitmapScopedWriteAccess pWriteAccess(aBitmap);
+pWriteAccess->Erase(COL_BLACK);
+for (int i = 0; i < 8; ++i)
+{
+for (int j = 0; j < 8; ++j)
+{
+pWriteAccess->SetPixel(i, j, COL_LIGHTRED);
+}
+}
+for (int i = 8; i < 16; ++i)
+{
+for (int j = 8; j < 16; ++j)
+{
+pWriteAccess->SetPixel(i, j, COL_LIGHTBLUE);
+}
+}
+}
+BitmapEx aBitmapEx(aBitmap);
+
+vcl::PngImageWriter aPngWriter(rStream);
+CPPUNIT_ASSERT_EQUAL(true, aPngWriter.write(aBitmapEx));
+}
+{
+SvStream& rStream = *aTempFile.GetStream(StreamMode::READ);
+rStream.Seek(0);
+
+vcl::PngImageReader aPngReader(rStream);
+BitmapEx aBitmapEx;
+CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
+
+CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+}
+}
+
void PngFilterTest::testPng()
{
for (const OUString& aFileName : { OUString("rect-1bit-pal.png") })
diff --git a/vcl/source/filter/png/PngImageWriter.cxx
b/vcl/source/filter/png/PngImageWriter.cxx
new file mode 100644
index ..222e5308da68
--- /dev/null
+++ b/vcl/source/filter/png/PngImageWriter.cxx
@@ -0,0 +1,104 @@
+/* -*- 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
+
+namespace vcl
+{
+static void lclWriteStream(png_structp pPng, png_bytep pData, png_size_t
pDataSize)
+{
+png_voidp pIO = png_get_io_ptr(pPng);
+
+if (pIO == nullptr)
+return;
+
+SvStream* pStream = static_cast(pIO);
+
+sal_Size nBytesWritten = pStream->WriteBytes(pData, pDataSize);
+
+if (nBytesWritten != pDataSize)
+png_error(pPng, "Write Error");
+}
+
+bool pngWrite(SvStream& rStream, BitmapEx& rBitmapEx)
+{
+png_structp pPng = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr
Questions about ./bin/update_pch.sh
Hello, I'm trying failing Windows builds by using ./bin/update_pch.sh but it seems when 1 TB is fixed, another begins to fail. Also, when relaunching the script, there are always changes (other than the generating line of course). What's the trick here? Should I run this script until there are no more functional changes? Julien -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/svg/svgexport.cxx | 161 ++--
filter/source/svg/svgfilter.hxx |5 +
filter/source/svg/svgwriter.cxx | 54 -
filter/source/svg/svgwriter.hxx |5 +
4 files changed, 198 insertions(+), 27 deletions(-)
New commits:
commit 3d008f3bcd19a74cff0781cbd9a3d173892553cf
Author: Marco Cecchetti
AuthorDate: Fri Jan 22 19:31:26 2021 +0100
Commit: Andras Timar
CommitDate: Sat Mar 6 21:58:48 2021 +0100
filter: svg: js engine: support for bitmaps in slide background
When a slide background includes one or more bitmaps, they are
exported only once.
This avoid to export the same bitmap more than once when it is
embedded in several backgound slides and to export only one bitmap for
the tile style.
Change-Id: Ia5b75f7805541486b76a81f86907e88ed9d4764a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109835
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Marco Cecchetti
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111842
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index e35a42746216..4eb56a5a9ced 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -427,6 +427,12 @@ namespace
BitmapChecksum GetBitmapChecksum( const MetaAction* pAction )
{
+if( !pAction )
+{
+OSL_FAIL( "GetBitmapChecksum: passed MetaAction pointer is null." );
+return 0;
+}
+
BitmapChecksum nChecksum = 0;
const MetaActionType nType = pAction->GetType();
@@ -435,19 +441,16 @@ BitmapChecksum GetBitmapChecksum( const MetaAction*
pAction )
case MetaActionType::BMPSCALE:
{
const MetaBmpScaleAction* pA = static_cast(pAction);
-if( pA )
-nChecksum = pA->GetBitmap().GetChecksum();
-else
-OSL_FAIL( "GetBitmapChecksum: MetaBmpScaleAction pointer is
null." );
+// The conversion to BitmapEx is needed since a Bitmap object is
+// converted to BitmapEx before passing it to
SVGActionWriter::ImplWriteBmp
+// where the checksum is checked for matching.
+nChecksum = BitmapEx( pA->GetBitmap() ).GetChecksum();
}
break;
case MetaActionType::BMPEXSCALE:
{
const MetaBmpExScaleAction* pA = static_cast(pAction);
-if( pA )
-nChecksum = pA->GetBitmapEx().GetChecksum();
-else
-OSL_FAIL( "GetBitmapChecksum: MetaBmpExScaleAction pointer is
null." );
+nChecksum = pA->GetBitmapEx().GetChecksum();
}
break;
default: break;
@@ -455,37 +458,95 @@ BitmapChecksum GetBitmapChecksum( const MetaAction*
pAction )
return nChecksum;
}
-} // end anonymous namespace
+MetaAction* CreateMetaBitmapAction( const MetaAction* pAction, const Point&
rPt, const Size& rSz )
+{
+if( !pAction )
+{
+OSL_FAIL( "CreateMetaBitmapAction: passed MetaAction pointer is null."
);
+return nullptr;
+}
+MetaAction* pResAction = nullptr;
+const MetaActionType nType = pAction->GetType();
+switch( nType )
+{
+case MetaActionType::BMPSCALE:
+{
+const MetaBmpScaleAction* pA = static_cast(pAction);
+pResAction = new MetaBmpScaleAction( rPt, rSz, pA->GetBitmap() );
+}
+break;
+case MetaActionType::BMPEXSCALE:
+{
+const MetaBmpExScaleAction* pA = static_cast(pAction);
+pResAction = new MetaBmpExScaleAction( rPt, rSz, pA->GetBitmapEx()
);
+}
+break;
+default: break;
+}
+return pResAction;
+}
-static void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
+void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
{
+if( !pAction )
+{
+OSL_FAIL( "MetaBitmapActionGetPoint: passed MetaAction pointer is
null." );
+return;
+}
const MetaActionType nType = pAction->GetType();
switch( nType )
{
case MetaActionType::BMPSCALE:
{
const MetaBmpScaleAction* pA = static_cast(pAction);
-if( pA )
-rPt = pA->GetPoint();
-else
-OSL_FAIL( "MetaBitmapActionGetPoint: MetaBmpScaleAction
pointer is null." );
+rPt = pA->GetPoint();
}
break;
case MetaActionType::BMPEXSCALE:
{
const MetaBmpExScaleAction* pA = static_cast(pAction);
-if( pA )
-rPt = pA->GetPoint();
-else
-OSL_FAIL( "MetaBitmapActionGetPoint: MetaBmpExScaleAction
pointer is null." );
+rPt = pA->GetPoint();
}
break;
default: break;
}
+}
+
+void MetaBitmapActionGetSize( const MetaAction* pAction, Size& rSz )
+{
[Libreoffice-commits] core.git: connectivity/inc cppcanvas/inc dbaccess/inc desktop/inc drawinglayer/inc svl/inc svx/inc writerfilter/inc xmlsecurity/inc
connectivity/inc/pch/precompiled_ado.hxx |2 +- cppcanvas/inc/pch/precompiled_cppcanvas.hxx |3 +-- dbaccess/inc/pch/precompiled_dba.hxx |3 ++- desktop/inc/pch/precompiled_deploymentmisc.hxx|3 +-- drawinglayer/inc/pch/precompiled_drawinglayer.hxx |3 +-- svl/inc/pch/precompiled_svl.hxx |5 ++--- svx/inc/pch/precompiled_svxcore.hxx |3 +-- writerfilter/inc/pch/precompiled_writerfilter.hxx |5 + xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 +- 9 files changed, 11 insertions(+), 18 deletions(-) New commits: commit cc3b9c0bcc4a379efb99b273c426a5ecb2214d0f Author: Julien Nabet AuthorDate: Sat Mar 6 20:42:57 2021 +0100 Commit: Julien Nabet CommitDate: Sat Mar 6 21:31:05 2021 +0100 update pches Change-Id: Id892e426343746df2f01f4cdc5f470351bdb6a12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112099 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 219dda8c92c8..817241b563b8 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-03-06 18:49:18 using: + Generated on 2021-03-06 20:41:31 using: ./bin/update_pch connectivity ado --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index a9fc21d0d011..794e5b581f18 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-03-06 18:49:20 using: + Generated on 2021-03-06 20:41:34 using: ./bin/update_pch cppcanvas cppcanvas --cutoff=11 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index bac36bcf8dc1..fe42640310eb 100644 --- a/dbaccess/inc/pch/precompiled_dba.hxx +++ b/dbaccess/inc/pch/precompiled_dba.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-03-06 18:49:22 using: + Generated on 2021-03-06 20:41:35 using: ./bin/update_pch dbaccess dba --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx index b903362fdb75..2c6f14d15bc3 100644 --- a/desktop/inc/pch/precompiled_deploymentmisc.hxx +++ b/desktop/inc/pch/precompiled_deploymentmisc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-03-06 18:49:24 using: + Generated on 2021-03-06 20:41:37 using: ./bin/update_pch desktop deploymentmisc --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -34,7 +34,6 @@ #if PCH_LEVEL >= 2 #include #include -#include #include #include #include diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index b6825423b262..043fdddec09a 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-03-06 18:49:25 using: + Generated on 2021-03-06 20:41:38 using: ./bin/update_pch drawinglayer drawinglayer --cutoff=4 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx index 908c1968e217..83dd5d
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/edtwin.cxx | 94 ++
1 file changed, 46 insertions(+), 48 deletions(-)
New commits:
commit 7d359438fe59d49948835dbaa7d3f20ee16ad997
Author: Miklos Vajna
AuthorDate: Fri Mar 5 17:53:25 2021 +0100
Commit: Miklos Vajna
CommitDate: Sat Mar 6 20:22:47 2021 +0100
sw: rename misleading rMEvt, which is not a reference
Change-Id: I6a3999be3003b8dd19cca665401fb1c4c3f004a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112025
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 987f2c79f772..9cdd4c9236af 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2814,16 +2814,16 @@ void SwEditWin::MouseButtonDown(const MouseEvent&
_rMEvt)
if ( bIsOleActive && PopupMenu::IsInExecute() )
return;
-MouseEvent rMEvt(_rMEvt);
+MouseEvent aMEvt(_rMEvt);
-if (m_rView.GetPostItMgr()->IsHit(rMEvt.GetPosPixel()))
+if (m_rView.GetPostItMgr()->IsHit(aMEvt.GetPosPixel()))
return;
if (comphelper::LibreOfficeKit::isActive())
{
-if (vcl::Window* pWindow =
m_rView.GetPostItMgr()->IsHitSidebarWindow(rMEvt.GetPosPixel()))
+if (vcl::Window* pWindow =
m_rView.GetPostItMgr()->IsHitSidebarWindow(aMEvt.GetPosPixel()))
{
-pWindow->MouseButtonDown(rMEvt);
+pWindow->MouseButtonDown(aMEvt);
return;
}
}
@@ -2838,14 +2838,14 @@ void SwEditWin::MouseButtonDown(const MouseEvent&
_rMEvt)
bool bExecFormatPaintbrush = m_pApplyTempl &&
m_pApplyTempl->m_pFormatClipboard
&&
m_pApplyTempl->m_pFormatClipboard->HasContent();
if( bExecFormatPaintbrush )
-rMEvt = MouseEvent( _rMEvt.GetPosPixel(), _rMEvt.GetClicks(),
-_rMEvt.GetMode(), _rMEvt.GetButtons() );
+aMEvt = MouseEvent(_rMEvt.GetPosPixel(), _rMEvt.GetClicks(),
_rMEvt.GetMode(),
+ _rMEvt.GetButtons());
}
m_bWasShdwCursor = nullptr != m_pShadCursor;
m_pShadCursor.reset();
-const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
+const Point aDocPos(PixelToLogic(aMEvt.GetPosPixel()));
FrameControlType eControl;
bool bOverFly = false;
@@ -2966,7 +2966,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
SwFlyFrameFormat *pFormat =
static_cast(rSh.GetFlyFrameFormat());
if ( rSh.Chainable( aDummy, *pFormat, aDocPos ) == SwChainRet::OK )
rSh.Chain( *pFormat, aDocPos );
-UpdatePointer( aDocPos, rMEvt.GetModifier() );
+UpdatePointer(aDocPos, aMEvt.GetModifier());
return;
}
@@ -2988,7 +2988,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
SdrView *pSdrView = rSh.GetDrawView();
if ( pSdrView )
{
-if (pSdrView->MouseButtonDown( rMEvt, this ) )
+if (pSdrView->MouseButtonDown(aMEvt, this))
{
rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
return; // SdrView's event evaluated
@@ -2996,13 +2996,13 @@ void SwEditWin::MouseButtonDown(const MouseEvent&
_rMEvt)
}
m_bIsInMove = false;
-m_aStartPos = rMEvt.GetPosPixel();
+m_aStartPos = aMEvt.GetPosPixel();
m_aRszMvHdlPt.setX( 0 );
m_aRszMvHdlPt.setY( 0 );
SwTab nMouseTabCol = SwTab::COL_NONE;
-const bool bTmp = !rSh.IsDrawCreate() && !m_pApplyTempl &&
!rSh.IsInSelect() &&
- rMEvt.GetClicks() == 1 && MOUSE_LEFT == rMEvt.GetButtons();
+const bool bTmp = !rSh.IsDrawCreate() && !m_pApplyTempl &&
!rSh.IsInSelect()
+ && aMEvt.GetClicks() == 1 && MOUSE_LEFT ==
aMEvt.GetButtons();
if ( bTmp &&
SwTab::COL_NONE != (nMouseTabCol = rSh.WhichMouseTabCol( aDocPos ) )
&&
!rSh.IsObjSelectable( aDocPos ) )
@@ -3036,8 +3036,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
m_rView.InvalidateRulerPos();
SfxBindings& rBind = m_rView.GetViewFrame()->GetBindings();
rBind.Update();
-if ( RulerColumnDrag( rMEvt,
-(SwTab::COL_VERT == nMouseTabCol || SwTab::ROW_HORI ==
nMouseTabCol)) )
+if (RulerColumnDrag(
+aMEvt, (SwTab::COL_VERT == nMouseTabCol || SwTab::ROW_HORI
== nMouseTabCol)))
{
m_rView.SetTabColFromDoc( false );
m_rView.SetTabRowFromDoc( false );
@@ -3060,8 +3060,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
SfxBindings& rBind = m_rView.GetViewFrame()->GetBindings();
rBind.Update();
-if ( RulerMarginDrag( rMEvt,
-SwFEShell::IsVerticalModeAtNdAndPos( *pNodeAtPos,
aDocPos ) ) )
+if (RulerMarginDrag(aMEvt,
SwFEShell::IsVerticalModeAtNdAndPos(*pNodeAt
[Libreoffice-commits] core.git: canvas/inc chart2/inc connectivity/inc cppcanvas/inc cppuhelper/inc dbaccess/inc desktop/inc drawinglayer/inc reportdesign/inc sc/inc sd/inc slideshow/inc sot/inc svgio
canvas/inc/pch/precompiled_canvastools.hxx|3 - canvas/inc/pch/precompiled_oglcanvas.hxx |3 - chart2/inc/pch/precompiled_chartcore.hxx | 10 ++- connectivity/inc/pch/precompiled_ado.hxx |6 +- connectivity/inc/pch/precompiled_dbtools.hxx |3 - connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx |3 - cppcanvas/inc/pch/precompiled_cppcanvas.hxx |4 - cppuhelper/inc/pch/precompiled_cppuhelper.hxx |3 - dbaccess/inc/pch/precompiled_dba.hxx | 42 -- dbaccess/inc/pch/precompiled_dbu.hxx |5 + desktop/inc/pch/precompiled_deploymentmisc.hxx|3 - desktop/inc/pch/precompiled_sofficeapp.hxx|4 - drawinglayer/inc/pch/precompiled_drawinglayer.hxx |3 - reportdesign/inc/pch/precompiled_rptui.hxx|5 - sc/inc/pch/precompiled_sc.hxx | 14 +++- sd/inc/pch/precompiled_sd.hxx |3 - slideshow/inc/pch/precompiled_slideshow.hxx |7 +- sot/inc/pch/precompiled_sot.hxx |3 - svgio/inc/pch/precompiled_svgio.hxx |8 ++ svl/inc/pch/precompiled_svl.hxx |4 + sw/inc/pch/precompiled_msword.hxx |7 +- sw/inc/pch/precompiled_swui.hxx | 24 sw/inc/pch/precompiled_vbaswobj.hxx | 14 +--- uui/inc/pch/precompiled_uui.hxx |3 - writerfilter/inc/pch/precompiled_writerfilter.hxx |5 + xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 13 +++- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 27 files changed, 135 insertions(+), 69 deletions(-) New commits: commit 2bcb38a6b8c855ee464c840f66d87b2985c7f09a Author: Julien Nabet AuthorDate: Sat Mar 6 18:51:47 2021 +0100 Commit: Julien Nabet CommitDate: Sat Mar 6 19:52:47 2021 +0100 update pches I just used ./bin/update_pch.sh Change-Id: I06a7f36eb4c511b8d6c6477fd87e57f0d9702457 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112097 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/canvas/inc/pch/precompiled_canvastools.hxx b/canvas/inc/pch/precompiled_canvastools.hxx index a3f730ebb2c9..5288be5704c1 100644 --- a/canvas/inc/pch/precompiled_canvastools.hxx +++ b/canvas/inc/pch/precompiled_canvastools.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2020-10-02 11:01:53 using: + Generated on 2021-03-06 18:49:14 using: ./bin/update_pch canvas canvastools --cutoff=1 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -23,6 +23,7 @@ #if PCH_LEVEL >= 1 #include #include +#include #include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 diff --git a/canvas/inc/pch/precompiled_oglcanvas.hxx b/canvas/inc/pch/precompiled_oglcanvas.hxx index a3731af352e0..f59783612533 100644 --- a/canvas/inc/pch/precompiled_oglcanvas.hxx +++ b/canvas/inc/pch/precompiled_oglcanvas.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2020-10-02 11:01:53 using: + Generated on 2021-03-06 18:49:14 using: ./bin/update_pch canvas oglcanvas --cutoff=1 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -22,7 +22,6 @@ #if PCH_LEVEL >= 1 #include -#include #include #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx index 099de23abcb4..f27972d9e1c8 100644 --- a/chart2/inc/pch/precompiled_chartcore.hxx +++ b/chart2/inc/pch/precompiled_chartcore.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-02-22 20:24:22 using: + Generated on 2021-03-06 18:49:18 using: ./bin/update_pch chart2 chartcore --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -76,7 +76,6 @@ #include #include #include -#include #include #include #include @@ -86,8 +85,11 @@ #include #include #include +#include #include +#include #include +#include #include #include #include @@ -155,6 +157,7 @@ #include #include #include +#include #include #include #in
nHow to do you add Firefox Media to Libreoffice? This Is My 1st Post So Pls Direct Me To The Correct List
LibreOffice Developers
This my first time posting so please direct me to the most appropiate list
Pls can someone tell me how to take the code from firefox that handles
video and audio media and insert it into Libreoffice? Someone did suggest
that in 2011 but I do not know if that was done.
Or get Firefox to access a Libreoffice file directly.
Firefox can play videos and media with a progress bar etc - there is also a
vlc extension for firefox.
While Lireoffice has good ideas and features eg everything in a single file
and toc.
Due to the scale of my project the subdocuments are generated using perl.
Most of what is required is done or acheivable except for the video / audio
media section.
A html version can already be generated but it produces lots of picture and
media files.
How do you put video and audio in a odt file? After all it is another
draw:frame just like an image or text box.
In the impress route you have to add autostart and still there is no
autostop or pause bar.
In openoffice::oodoc::text you can add in an image as well as text.
Is there a way using openoffice::oodoc::xpath to simply generate the xml
code required. This technique is already being used in my project to add in
images, text boxes, toc etc.
For example
#!/usr/bin/perl
use strict;
use warnings;
use utf8;
use OpenOffice::OODoc;
use OpenOffice::OODoc::XPath;
# open the document container
my $cont = odfContainer("/path/to/ExistingTemplateFile.odt");
# set up the doc variable
my $doc = odfDocument(
"container" => $cont,
"part" => 'content');
# set up song file and member parameters
my $song = "MySong.webm";
my $songfile = "/path/to/".$song;
my $member = "Media/".$song;
my $wdth = 640;
my $hght = 400;
my $gx = 0;
my $gy = 0;
# see reference manual on command line with man or via google from CPAN
# man openoffice::oodoc::xpath
$doc->appendBodyElement( $doc->createElement (
'
'));
# Load the songfile into the Media section of the odt
$doc->raw_import($member, $songfile);
# Save The Updated odt
$doc->save("/path/to/UpdatedFile.odt");
sub frmtcm {
my $x = shift;
if (defined($x)) {
my $y = sprintf ("%7.3f", $x);
$y =~ s/^ *//g;
return $y;
} else {
return 0;
}
}
sub px2cm {
return $_[0] * 2.54 / 96;
}
Or as an alternative can Firefox other browser which can handle xml be made
to access the video from the odt file and the browser be accessed using
imbeded html object. This html works fine on a stand alone video src file
but does not extract the song from an odt yet. How to fix this?
MySong Video
Your browser does not support the video tag.
Thank you for your attention to my question.
Regards
Philip
My Lenova laptop runs Fedora 33
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/SidebarPanelBase.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit c86090015f19506d9d1f67c99f7ee67f9a161b4c
Author: Szymon Kłos
AuthorDate: Fri Feb 12 17:18:51 2021 +0100
Commit: Szymon Kłos
CommitDate: Sat Mar 6 17:49:08 2021 +0100
sidebar: use real height to determine preffered size
There was a bug causing to crop the sidebar in online:
1. open odt file in 2 sessions
2. select image in session A
3. move mouse over sidebar in session B
4. move mouse over sidebar in session A
Result: sidebar A was cropped
PosSizePropertyPanel on context change
did some windows visibility changes in the meantime.
get_preffered_size() returned lower height than real
value in SidebarPanelBase::getHeightForWidth
call queue_resize to invalidate cached optimal size
Change-Id: I8080259ffb12ae3f6613e7749e908d6ef55c1f3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110894
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112092
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx
b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 0ed57e2f66c2..ea98f7659aef 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -172,6 +172,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth
(const sal_Int32 nWi
else if (isLayoutEnabled(mpControl))
{
// widget layout-based sidebar
+mpControl->queue_resize();
Size aSize(mpControl->get_preferred_size());
return ui::LayoutSize(aSize.Height(), aSize.Height(),
aSize.Height());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/jsdialog
vcl/inc/jsdialog/jsdialogbuilder.hxx | 63 ++-
vcl/jsdialog/jsdialogbuilder.cxx | 70 ---
2 files changed, 124 insertions(+), 9 deletions(-)
New commits:
commit ec195ae250c7be1b6e444e4173055cdf966dc48b
Author: Szymon Kłos
AuthorDate: Mon Mar 1 19:27:04 2021 +0100
Commit: Szymon Kłos
CommitDate: Sat Mar 6 17:48:57 2021 +0100
jsdialog: send selection change for icon view
- add posibility to send additional actions
- send selection change for icon view as separate
command - optimization, no need for rendering
Change-Id: I02dd129068baf32c265612a1cfa2c2af20319ae9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111767
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112071
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index d87f230eafc3..2b6672b2da05 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -26,6 +26,7 @@
#include
#include
+#include
class ToolBox;
class ComboBox;
@@ -34,6 +35,7 @@ class SvTabListBox;
class IconView;
typedef std::map WidgetMap;
+typedef std::unordered_map ActionDataMap;
namespace jsdialog
{
@@ -41,10 +43,52 @@ enum MessageType
{
FullUpdate,
WidgetUpdate,
-Close
+Close,
+Action
};
}
+/// Class with the message description for storing in the queue
+class JSDialogMessageInfo
+{
+public:
+jsdialog::MessageType m_eType;
+VclPtr m_pWindow;
+std::unique_ptr m_pData;
+
+private:
+void copy(const JSDialogMessageInfo& rInfo)
+{
+this->m_eType = rInfo.m_eType;
+this->m_pWindow = rInfo.m_pWindow;
+if (rInfo.m_pData)
+{
+std::unique_ptr pData(new
ActionDataMap(*rInfo.m_pData));
+this->m_pData = std::move(pData);
+}
+}
+
+public:
+JSDialogMessageInfo(jsdialog::MessageType eType, VclPtr
pWindow,
+std::unique_ptr pData)
+: m_eType(eType)
+, m_pWindow(pWindow)
+, m_pData(std::move(pData))
+{
+}
+
+JSDialogMessageInfo(const JSDialogMessageInfo& rInfo) { copy(rInfo); }
+
+JSDialogMessageInfo& operator=(JSDialogMessageInfo aInfo)
+{
+if (this == &aInfo)
+return *this;
+
+copy(aInfo);
+return *this;
+}
+};
+
class JSDialogNotifyIdle : public Idle
{
// used to send message
@@ -55,7 +99,7 @@ class JSDialogNotifyIdle : public Idle
std::string m_LastNotificationMessage;
bool m_bForce;
-std::deque>>
m_aMessageQueue;
+std::deque m_aMessageQueue;
public:
JSDialogNotifyIdle(VclPtr aNotifierWindow,
VclPtr aContentWindow,
@@ -65,13 +109,16 @@ public:
void clearQueue();
void forceUpdate();
-void sendMessage(jsdialog::MessageType eType, VclPtr pWindow);
+void sendMessage(jsdialog::MessageType eType, VclPtr pWindow,
+ std::unique_ptr pData = nullptr);
private:
void send(tools::JsonWriter& aJsonWriter);
std::unique_ptr generateFullUpdate() const;
std::unique_ptr
generateWidgetUpdate(VclPtr pWindow) const;
std::unique_ptr generateCloseMessage() const;
+std::unique_ptr
+generateActionMessage(VclPtr pWindow,
std::unique_ptr pData) const;
};
class JSDialogSender
@@ -91,6 +138,7 @@ public:
virtual void sendFullUpdate(bool bForce = false);
void sendClose();
void sendUpdate(VclPtr pWindow, bool bForce = false);
+virtual void sendAction(VclPtr pWindow,
std::unique_ptr pData);
void flush() { mpIdleNotify->Invoke(); }
protected:
@@ -218,6 +266,8 @@ public:
virtual void sendUpdate(bool bForce = false) = 0;
virtual void sendFullUpdate(bool bForce = false) = 0;
+
+virtual void sendAction(std::unique_ptr pData) = 0;
};
template
@@ -307,6 +357,12 @@ public:
if ((!m_bIsFreezed || bForce) && m_pSender)
m_pSender->sendFullUpdate(bForce);
}
+
+virtual void sendAction(std::unique_ptr pData) override
+{
+if (!m_bIsFreezed && m_pSender && pData)
+m_pSender->sendAction(BaseInstanceClass::m_xWidget,
std::move(pData));
+}
};
class JSDialog : public JSWidget
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index b9d0a308e4bd..5c379952a634 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -27,6 +27,8 @@
#include
#include
+#define ACTION_TYPE "action_type"
+
namespace
{
void response_help(vcl::Window* pWindow)
@@ -83,7 +85,19 @@ void JSDialogNotifyIdle::send(tools::JsonWriter& aJsonWriter)
}
}
-void JSDialogNotifyIdle::sendMessage(jsdialog::MessageType eType,
VclPtr pWindow)
+namespace
+{
+OUString extractActionType(const ActionDataMap& rData)
+{
+auto
Possible fix to Windows timeouts in CI - rebase on master recommended
Hi! During last several months, I had experienced local 'make check' builds hangs on Windows, and debugging showed that the problem was a deadlock between a clipboard COM object being deleted on main thread and waiting for the clipboard MTA thread, and the clipboard thread waiting for main thread to process some event (unfortunately, I have no sample stack trace at hand). That was intermittent, but often enough to be annoying; however, that was not affecting CI much as far as I could see. But during last several days, I saw many Windows builds timed out, and I suspected that this might be the same underlying issue (unfortunately, CI does not provide the backtrace for timed out Windows builds). I suppose that this is not prevented by Noel's nice patch https://gerrit.libreoffice.org/c/core/+/111498, because IIUC it only prevented writing/reading system clipboard when performing clipboard-related tests, not listening to clipboard changes. The problem could get worsened by https://gerrit.libreoffice.org/c/core/+/111825, which made sure that the COM object was created each time, when previously many such events could result in failed clipboard opening, and thus skipped COM object creation. So I attempted to address the underlying issue with https://gerrit.libreoffice.org/c/core/+/112044, to not create COM clipboard objects in response to "clipboard changed" event (and only create those when actually pasting from system clipboard). The bottom line is: the said patch is merged now, and you might want to rebase to see if the timeouts will go. -- Best regards, Mike Kaganski ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/repeat.png |binary icon-themes/elementary/cmd/lc_repeat.png |binary icon-themes/elementary/cmd/sc_repeat.png |binary icon-themes/elementary_svg/cmd/32/repeat.svg |2 +- icon-themes/elementary_svg/cmd/lc_repeat.svg |2 +- icon-themes/elementary_svg/cmd/sc_repeat.svg |2 +- 6 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 9eeb580f5c57918484baff74ca052a96ed1056b3 Author: Rizal Muttaqin AuthorDate: Sat Mar 6 17:35:20 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Mar 6 17:05:56 2021 +0100 elementary: related to tdf#140838 new Undo & Redo icons Change-Id: Ifc24f15cb876ce5676ff288a87b39b9a632dbcd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112057 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/repeat.png b/icon-themes/elementary/cmd/32/repeat.png index 4ea563b64159..843d7c7c808a 100644 Binary files a/icon-themes/elementary/cmd/32/repeat.png and b/icon-themes/elementary/cmd/32/repeat.png differ diff --git a/icon-themes/elementary/cmd/lc_repeat.png b/icon-themes/elementary/cmd/lc_repeat.png index a3b48ec3d1e9..990623feaa6c 100644 Binary files a/icon-themes/elementary/cmd/lc_repeat.png and b/icon-themes/elementary/cmd/lc_repeat.png differ diff --git a/icon-themes/elementary/cmd/sc_repeat.png b/icon-themes/elementary/cmd/sc_repeat.png index 4979a22abc52..8734e70aa355 100644 Binary files a/icon-themes/elementary/cmd/sc_repeat.png and b/icon-themes/elementary/cmd/sc_repeat.png differ diff --git a/icon-themes/elementary_svg/cmd/32/repeat.svg b/icon-themes/elementary_svg/cmd/32/repeat.svg index 06119cc6c63c..5030906b9a32 100644 --- a/icon-themes/elementary_svg/cmd/32/repeat.svg +++ b/icon-themes/elementary_svg/cmd/32/repeat.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< path d="m5.492695 23c0-5 2.509931-9.5 9.176597-9.5h1.34" opacity=".8" stroke="url(#d)"/> \ No newline at end of file diff --git a/icon-themes/elementary_svg/cmd/lc_repeat.svg b/icon-themes/elementary_svg/cmd/lc_repeat.svg index 90232a7c0672..1d6963501b78 100644 --- a/icon-themes/elementary_svg/cmd/lc_repeat.svg +++ b/icon-themes/elementary_svg/cmd/lc_repeat.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/cmd/sc_repeat.svg b/icon-themes/elementary_svg/cmd/sc_repeat.svg index b5d1bc08b3ee..39c7c6eb8b60 100644 --- a/icon-themes/elementary_svg/cmd/sc_repeat.svg +++ b/icon-themes/elementary_svg/cmd/sc_repeat.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/ar/recundo.png |binary icon-themes/elementary/cmd/32/ar/redo.png|binary icon-themes/elementary/cmd/32/ar/undo.png|binary icon-themes/elementary/cmd/32/recundo.png|binary icon-themes/elementary/cmd/32/redo.png |binary icon-themes/elementary/cmd/32/undo.png |binary icon-themes/elementary/cmd/ar/lc_recundo.png |binary icon-themes/elementary/cmd/ar/lc_redo.png|binary icon-themes/elementary/cmd/ar/lc_undo.png|binary icon-themes/elementary/cmd/ar/sc_recundo.png |binary icon-themes/elementary/cmd/ar/sc_redo.png|binary icon-themes/elementary/cmd/ar/sc_undo.png|binary icon-themes/elementary/cmd/lc_recundo.png|binary icon-themes/elementary/cmd/lc_redo.png |binary icon-themes/elementary/cmd/lc_undo.png |binary icon-themes/elementary/cmd/sc_recundo.png|binary icon-themes/elementary/cmd/sc_redo.png |binary icon-themes/elementary/cmd/sc_undo.png |binary icon-themes/elementary_svg/cmd/32/ar/recundo.svg |2 +- icon-themes/elementary_svg/cmd/32/ar/redo.svg|2 +- icon-themes/elementary_svg/cmd/32/ar/undo.svg|2 +- icon-themes/elementary_svg/cmd/32/recundo.svg|2 +- icon-themes/elementary_svg/cmd/32/redo.svg |2 +- icon-themes/elementary_svg/cmd/32/undo.svg |2 +- icon-themes/elementary_svg/cmd/ar/lc_recundo.svg |2 +- icon-themes/elementary_svg/cmd/ar/lc_redo.svg|2 +- icon-themes/elementary_svg/cmd/ar/lc_undo.svg|2 +- icon-themes/elementary_svg/cmd/ar/sc_recundo.svg |2 +- icon-themes/elementary_svg/cmd/ar/sc_redo.svg|2 +- icon-themes/elementary_svg/cmd/ar/sc_undo.svg|2 +- icon-themes/elementary_svg/cmd/lc_recundo.svg|2 +- icon-themes/elementary_svg/cmd/lc_redo.svg |2 +- icon-themes/elementary_svg/cmd/lc_undo.svg |2 +- icon-themes/elementary_svg/cmd/sc_recundo.svg|2 +- icon-themes/elementary_svg/cmd/sc_redo.svg |2 +- icon-themes/elementary_svg/cmd/sc_undo.svg |2 +- 36 files changed, 18 insertions(+), 18 deletions(-) New commits: commit d64ce9f3b239e87622dd5bf313476b503df730af Author: Rizal Muttaqin AuthorDate: Sat Mar 6 16:57:01 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Mar 6 17:04:47 2021 +0100 elementary: tdf#140838 new Undo & Redo icons Change-Id: Id1fae6168de9c431c54b6b6c985a5cd3a6082531 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112056 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/ar/recundo.png b/icon-themes/elementary/cmd/32/ar/recundo.png index fe9601da30b9..755cb0431141 100644 Binary files a/icon-themes/elementary/cmd/32/ar/recundo.png and b/icon-themes/elementary/cmd/32/ar/recundo.png differ diff --git a/icon-themes/elementary/cmd/32/ar/redo.png b/icon-themes/elementary/cmd/32/ar/redo.png index b859ed78d70b..84adfb4650df 100644 Binary files a/icon-themes/elementary/cmd/32/ar/redo.png and b/icon-themes/elementary/cmd/32/ar/redo.png differ diff --git a/icon-themes/elementary/cmd/32/ar/undo.png b/icon-themes/elementary/cmd/32/ar/undo.png index 6ff214c0e963..cc79e7f7722c 100644 Binary files a/icon-themes/elementary/cmd/32/ar/undo.png and b/icon-themes/elementary/cmd/32/ar/undo.png differ diff --git a/icon-themes/elementary/cmd/32/recundo.png b/icon-themes/elementary/cmd/32/recundo.png index 81cb6ceb1e3d..3a93c974135b 100644 Binary files a/icon-themes/elementary/cmd/32/recundo.png and b/icon-themes/elementary/cmd/32/recundo.png differ diff --git a/icon-themes/elementary/cmd/32/redo.png b/icon-themes/elementary/cmd/32/redo.png index 00e035ccbada..99b4b785e360 100644 Binary files a/icon-themes/elementary/cmd/32/redo.png and b/icon-themes/elementary/cmd/32/redo.png differ diff --git a/icon-themes/elementary/cmd/32/undo.png b/icon-themes/elementary/cmd/32/undo.png index 7990f7eed4f6..fa99b18c4078 100644 Binary files a/icon-themes/elementary/cmd/32/undo.png and b/icon-themes/elementary/cmd/32/undo.png differ diff --git a/icon-themes/elementary/cmd/ar/lc_recundo.png b/icon-themes/elementary/cmd/ar/lc_recundo.png index 9cbb86c4447b..be43f450e2d2 100644 Binary files a/icon-themes/elementary/cmd/ar/lc_recundo.png and b/icon-themes/elementary/cmd/ar/lc_recundo.png differ diff --git a/icon-themes/elementary/cmd/ar/lc_redo.png b/icon-themes/elementary/cmd/ar/lc_redo.png index 023036dc4f3c..a47eb9f287b7 100644 Binary files a/icon-themes/elementary/cmd/ar/lc_redo.png and b/icon-themes/elementary/cmd/ar/lc_redo.png differ diff --git a/icon-themes/elementary/cmd/ar/lc_undo.png b/icon-themes/elementary/cmd/ar/lc_undo.png index 2b6b5f39828b..78d2e1d530fc 100644 Binary files a/icon-themes/elementary/cmd/ar/lc_undo.png and b/icon-themes/elementary/cmd/ar/lc_undo.png differ diff --git a/icon-themes/elementary/cmd/ar/sc_recundo.png b/icon-themes/elementary/cmd/ar/sc_recundo.png inde
[Libreoffice-commits] core.git: svx/source sw/source
svx/source/inc/StylesPreviewWindow.hxx | 17 ++
svx/source/tbxctrls/StylesPreviewWindow.cxx | 32 +---
sw/source/uibase/app/docst.cxx |4 +++
3 files changed, 49 insertions(+), 4 deletions(-)
New commits:
commit 01d99c0005f67d6ecb139bae7463dc25d45884ef
Author: Szymon Kłos
AuthorDate: Tue Mar 2 12:18:21 2021 +0100
Commit: Szymon Kłos
CommitDate: Sat Mar 6 16:09:28 2021 +0100
Styles preview: use listener to trigger update
Do not render all styles on every selection change.
Use listener to detect styles modification.
Change-Id: I6d41acd7acad160d1477281d2b3d473233def4d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111833
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112013
Tested-by: Jenkins
diff --git a/svx/source/inc/StylesPreviewWindow.hxx
b/svx/source/inc/StylesPreviewWindow.hxx
index 7c2c572708ef..533ff40601b4 100644
--- a/svx/source/inc/StylesPreviewWindow.hxx
+++ b/svx/source/inc/StylesPreviewWindow.hxx
@@ -28,6 +28,7 @@
class StylesPreviewWindow_Base;
+/// Listener for style selection
class StyleStatusListener : public SfxStatusListener
{
StylesPreviewWindow_Base* m_pPreviewControl;
@@ -40,6 +41,19 @@ public:
void StateChanged(SfxItemState eState, const SfxPoolItem* pState) override;
};
+/// Listener for styles creation or modification
+class StylePoolChangeListener : public SfxListener
+{
+StylesPreviewWindow_Base* m_pPreviewControl;
+SfxStyleSheetBasePool* m_pStyleSheetPool;
+
+public:
+StylePoolChangeListener(StylesPreviewWindow_Base* pPreviewControl);
+~StylePoolChangeListener();
+
+virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
+};
+
class StyleItemController
{
static constexpr unsigned LEFT_MARGIN = 8;
@@ -70,6 +84,7 @@ protected:
std::unique_ptr m_xStylesView;
rtl::Reference m_xStatusListener;
+std::unique_ptr m_pStylePoolChangeListener;
std::vector> m_aDefaultStyles;
std::vector> m_aAllStyles;
@@ -87,10 +102,10 @@ public:
~StylesPreviewWindow_Base();
void Select(const OUString& rStyleName);
+void UpdateStylesList();
private:
void Update();
-void UpdateStylesList();
bool Command(const CommandEvent& rEvent);
};
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx
b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index f392c2fc90de..59e86b7d2bd6 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -72,6 +72,32 @@ void StyleStatusListener::StateChanged(SfxItemState
/*eState*/, const SfxPoolIte
m_pPreviewControl->Select(pStateItem->GetStyleName());
}
+StylePoolChangeListener::StylePoolChangeListener(StylesPreviewWindow_Base*
pPreviewControl)
+: SfxListener()
+, m_pPreviewControl(pPreviewControl)
+{
+SfxObjectShell* pDocShell = SfxObjectShell::Current();
+
+if (pDocShell)
+m_pStyleSheetPool = pDocShell->GetStyleSheetPool();
+
+if (m_pStyleSheetPool)
+{
+StartListening(*m_pStyleSheetPool);
+}
+}
+
+StylePoolChangeListener::~StylePoolChangeListener()
+{
+if (m_pStyleSheetPool)
+EndListening(*m_pStyleSheetPool);
+}
+
+void StylePoolChangeListener::Notify(SfxBroadcaster& /*rBC*/, const SfxHint&
/*rHint*/)
+{
+m_pPreviewControl->UpdateStylesList();
+}
+
StyleItemController::StyleItemController(const std::pair&
aStyleName)
: m_eStyleFamily(SfxStyleFamily::Para)
, m_aStyleName(aStyleName)
@@ -335,6 +361,9 @@ StylesPreviewWindow_Base::StylesPreviewWindow_Base(
m_xStatusListener = new StyleStatusListener(this, xDispatchProvider);
+m_pStylePoolChangeListener.reset(new StylePoolChangeListener(this));
+
+UpdateStylesList();
Update();
}
@@ -390,14 +419,11 @@ void StylesPreviewWindow_Base::Select(const OUString&
rStyleName)
{
m_sSelectedStyle = rStyleName;
-UpdateStylesList();
Update();
}
void StylesPreviewWindow_Base::Update()
{
-UpdateStylesList();
-
for (std::vector>::size_type i = 0; i <
m_aAllStyles.size(); ++i)
{
if (m_aAllStyles[i].first == m_sSelectedStyle ||
m_aAllStyles[i].second == m_sSelectedStyle)
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index ff9ea4af3585..f2a414a88955 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -1317,6 +1317,8 @@ void SwDocShell::UpdateStyle(const OUString &rName,
SfxStyleFamily nFamily, SwWr
break;
default: break;
}
+
+m_xDoc->BroadcastStyleOperation(rName, nFamily,
SfxHintId::StyleSheetModified);
}
// NewByExample
@@ -1510,6 +1512,8 @@ void SwDocShell::MakeByExample( const OUString &rName,
SfxStyleFamily nFamily,
default: break;
}
+
+m_xDoc->BroadcastStyleOperation(rName, nFamily,
SfxHintId::StyleSheetCreate
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/jsdialog
vcl/inc/jsdialog/jsdialogbuilder.hxx |3 +++
vcl/jsdialog/jsdialogbuilder.cxx | 17 +++--
2 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 15aed21fbf44d44656b8e6aff5affa04d12a6fed
Author: Szymon Kłos
AuthorDate: Fri Feb 26 09:00:33 2021 +0100
Commit: Szymon Kłos
CommitDate: Sat Mar 6 14:42:20 2021 +0100
jsdialog: stop idle on destruction
be sure timer is stopped after we destroy builder.
if we close abandon previous messages.
Change-Id: I8c5458d14c45660aadecb1559b87d30a32364ff6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111593
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111990
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index f07b0dd2e424..e2ff130b52aa 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -63,6 +63,7 @@ public:
void Invoke() override;
+void clearQueue();
void forceUpdate();
void sendMessage(jsdialog::MessageType eType, VclPtr pWindow);
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 5515a47d0326..b9d0a308e4bd 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -183,10 +183,16 @@ void JSDialogNotifyIdle::Invoke()
}
}
-m_aMessageQueue.clear();
+clearQueue();
}
-JSDialogSender::~JSDialogSender() { sendClose(); }
+void JSDialogNotifyIdle::clearQueue() { m_aMessageQueue.clear(); }
+
+JSDialogSender::~JSDialogSender()
+{
+sendClose();
+mpIdleNotify->Stop();
+}
void JSDialogSender::sendFullUpdate(bool bForce)
{
@@ -199,6 +205,7 @@ void JSDialogSender::sendFullUpdate(bool bForce)
void JSDialogSender::sendClose()
{
+mpIdleNotify->clearQueue();
mpIdleNotify->sendMessage(jsdialog::MessageType::Close, nullptr);
flush();
}
commit f1b884b748c8b13d4a8ec344aee6755752508437
Author: Szymon Kłos
AuthorDate: Mon Mar 1 10:01:42 2021 +0100
Commit: Szymon Kłos
CommitDate: Sat Mar 6 14:42:10 2021 +0100
jsdialog: update on treeview clear
Change-Id: I4152e7581ae9172e77474c7f62bd42351636793e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111733
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111989
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index d95a5826add0..f07b0dd2e424 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -473,6 +473,8 @@ public:
virtual void remove(int pos) override;
virtual void remove(const weld::TreeIter& rIter) override;
+virtual void clear() override;
+
void drag_start();
void drag_end();
};
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 5f4ad0ec2bd2..5515a47d0326 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1120,6 +1120,12 @@ void JSTreeView::remove(const weld::TreeIter& rIter)
sendUpdate();
}
+void JSTreeView::clear()
+{
+SalInstanceTreeView::clear();
+sendUpdate();
+}
+
void JSTreeView::expand_row(const weld::TreeIter& rIter)
{
SalInstanceTreeView::expand_row(rIter);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/view.hxx|3 +++
starmath/source/view.cxx |9 +
2 files changed, 12 insertions(+)
New commits:
commit cbd4dba6d6f056f4ffa2e1a199d75a235cb037b0
Author: dante
AuthorDate: Fri Mar 5 11:24:31 2021 +0100
Commit: Noel Grandin
CommitDate: Sat Mar 6 13:12:25 2021 +0100
Add to smviewshell an acces to the docking window
Change-Id: Ib5830ba0fef201cabb4e2589cbc277b72ed6b399
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111999
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index b3d5b72f4a6d..411904105059 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -35,6 +35,7 @@
class SmViewShell;
class SmPrintUIOptions;
class SmGraphicAccessible;
+class SmElementsDockingWindow;
namespace svtools { class ColorConfig; }
@@ -274,6 +275,8 @@ public:
return *mpGraphic;
}
+SmElementsDockingWindow* GetDockingWindow();
+
voidSetStatusText(const OUString& rText);
voidShowError( const SmErrorDesc *pErrorDesc );
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index ee72fb55b40c..b9399656d006 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1276,6 +1276,15 @@ SmEditWindow *SmViewShell::GetEditWindow()
return nullptr;
}
+SmElementsDockingWindow* SmViewShell::GetDockingWindow()
+{
+auto eldockwinwrap =
GetViewFrame()->GetChildWindow(SmElementsDockingWindowWrapper::GetChildWindowId());
+if(eldockwinwrap)
+return
dynamic_cast(eldockwinwrap->GetWindow());
+else
+return nullptr;
+}
+
void SmViewShell::SetStatusText(const OUString& rText)
{
maStatusText = rText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/parse.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1b64713b6cbcc2bf748b199e0c97dfd6d2f262ec
Author: dante
AuthorDate: Fri Mar 5 11:29:22 2021 +0100
Commit: Noel Grandin
CommitDate: Sat Mar 6 13:10:04 2021 +0100
SmParser obtainer, correct error on exception message
Change-Id: Ia2c0bad7546e5a4288ce70cf2a72e400ff722a94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112001
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 3ea272faef6b..45cb75d9a942 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -31,7 +31,7 @@ AbstractSmParser* starmathdatabase::GetDefaultSmParser()
return aParser;
}
default:
-throw std::range_error("parser depth limit");
+throw std::range_error("parser version limit");
}
}
@@ -45,7 +45,7 @@ AbstractSmParser*
starmathdatabase::GetVersionSmParser(sal_uInt16 nVersion)
return aParser;
}
default:
-throw std::range_error("parser depth limit");
+throw std::range_error("parser version limit");
}
}
/* 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: compilerplugins/clang sd/source sfx2/source svx/source sw/source
compilerplugins/clang/staticdynamic.cxx | 64 +++
compilerplugins/clang/test/staticdynamic.cxx |8 ++
sd/source/ui/accessibility/AccessibleOutlineView.cxx |3
sd/source/ui/unoidl/unoobj.cxx |5 -
sd/source/ui/view/drviews6.cxx |9 --
sfx2/source/control/unoctitm.cxx |6 -
sfx2/source/doc/objxtor.cxx |5 +
sfx2/source/toolbox/tbxitem.cxx |7 +-
svx/source/svdraw/svdedtv.cxx| 14 +---
svx/source/svdraw/svdedtv2.cxx |5 +
sw/source/core/access/accmap.cxx |6 -
sw/source/core/doc/doclay.cxx| 16 ++--
sw/source/core/draw/dview.cxx|3
sw/source/core/frmedt/fews.cxx |5 -
14 files changed, 102 insertions(+), 54 deletions(-)
New commits:
commit bd37588605f7773d41b5388b18952e5c90f12214
Author: Noel
AuthorDate: Fri Mar 5 08:37:41 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Mar 6 13:08:26 2021 +0100
loplugin:staticdynamic look for static after dynamic
Change-Id: Ic3066d9a9441e369370cc6aa0fbffb9a321bc928
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111985
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/staticdynamic.cxx
b/compilerplugins/clang/staticdynamic.cxx
index b2383413b287..b104b0333fcd 100644
--- a/compilerplugins/clang/staticdynamic.cxx
+++ b/compilerplugins/clang/staticdynamic.cxx
@@ -45,22 +45,26 @@ public:
private:
// the key is the pair of VarDecl and the type being cast to.
-typedef std::map,
SourceLocation> MapType;
-MapType staticCastVars;
+struct BlockState
+{
+std::map,
SourceLocation> staticCastVars;
+std::map,
SourceLocation> dynamicCastVars;
+};
// only maintain state inside a single basic block, we're not trying to
analyse
// cross-block interactions.
-std::vector blockStack;
+std::vector blockStack;
+BlockState blockState;
};
bool StaticDynamic::PreTraverseCompoundStmt(CompoundStmt*)
{
-blockStack.push_back(std::move(staticCastVars));
+blockStack.push_back(std::move(blockState));
return true;
}
bool StaticDynamic::PostTraverseCompoundStmt(CompoundStmt*, bool)
{
-staticCastVars = std::move(blockStack.back());
+blockState = std::move(blockStack.back());
blockStack.pop_back();
return true;
}
@@ -86,8 +90,28 @@ bool StaticDynamic::VisitCXXStaticCastExpr(CXXStaticCastExpr
const* staticCastEx
auto varDecl = dyn_cast_or_null(subExprDecl->getDecl());
if (!varDecl)
return true;
-staticCastVars.insert({ { varDecl,
staticCastExpr->getTypeAsWritten().getTypePtr() },
-compat::getBeginLoc(staticCastExpr) });
+auto it = blockState.dynamicCastVars.find(
+{ varDecl, staticCastExpr->getTypeAsWritten().getTypePtr() });
+if (it != blockState.dynamicCastVars.end())
+{
+StringRef fn = getFilenameOfLocation(
+
compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(staticCastExpr)));
+// loop
+if (loplugin::isSamePathname(fn, SRCDIR
"/basctl/source/basicide/basobj3.cxx"))
+return true;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sw/source/core/doc/swserv.cxx"))
+return true;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sw/source/core/text/txtfly.cxx"))
+return true;
+
+report(DiagnosticsEngine::Warning, "static_cast after dynamic_cast",
+ compat::getBeginLoc(staticCastExpr))
+<< staticCastExpr->getSourceRange();
+report(DiagnosticsEngine::Note, "dynamic_cast here", it->second);
+return true;
+}
+blockState.staticCastVars.insert({ { varDecl,
staticCastExpr->getTypeAsWritten().getTypePtr() },
+ compat::getBeginLoc(staticCastExpr) });
return true;
}
@@ -102,13 +126,27 @@ bool
StaticDynamic::VisitCXXDynamicCastExpr(CXXDynamicCastExpr const* dynamicCas
auto varDecl = dyn_cast_or_null(subExprDecl->getDecl());
if (!varDecl)
return true;
-auto it = staticCastVars.find({ varDecl,
dynamicCastExpr->getTypeAsWritten().getTypePtr() });
-if (it == staticCastVars.end())
+auto it = blockState.staticCastVars.find(
+{ varDecl, dynamicCastExpr->getTypeAsWritten().getTypePtr() });
+if (it != blockState.staticCastVars.end())
+{
+report(DiagnosticsEngine::Warning, "dynamic_cast after static_cast",
+ compat::getBeginLoc(dynamicCastExpr))
+<< dynamicCastExpr->getSourceRange();
+report(DiagnosticsEngine::Note, "static_cast here", it->second);
return true;
-report(DiagnosticsEngine::Warning, "dynamic_cast after static_cast",
- compat::getBegi
[Libreoffice-commits] core.git: include/svx include/vcl svx/source vcl/source
include/svx/SvxColorValueSet.hxx |4 +++-
include/vcl/settings.hxx |4
svx/source/tbxctrls/SvxColorValueSet.cxx |5 -
vcl/source/app/settings.cxx |6 --
4 files changed, 3 insertions(+), 16 deletions(-)
New commits:
commit 4474d167e1b69ab9ca8a97c636f0400a5084641a
Author: Noel Grandin
AuthorDate: Sat Mar 6 08:38:12 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Mar 6 13:07:58 2021 +0100
drop StyleSettings::GetColorValueSetMaximumRowCount
pull it into the only place it is used.
Change-Id: I5923f1599e033d893cebea606138c53ab2cd02fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112045
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index 82792acf64f4..dd8f93348153 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -32,7 +32,9 @@ public:
virtual void Resize() override;
-static sal_uInt32 getMaxRowCount();
+/* Maximum row/line count for the ColorValueSet control. If more lines
would be needed, a scrollbar will
+ be used. */
+static constexpr sal_uInt32 getMaxRowCount() { return 10; }
static sal_uInt32 getEntryEdgeLength();
static sal_uInt32 getColumnCount();
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 1e18e005cb70..38b7d423936c 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -597,10 +597,6 @@ public:
voidSetColorValueSetColumnCount(sal_uInt16
nCount);
sal_uInt16 GetColorValueSetColumnCount() const;
-// maximum row/line count for the ColorValueSet control. If more lines
would be needed, a scrollbar will
-// be used.
-static sal_uInt16 GetColorValueSetMaximumRowCount();
-
voidSetListBoxPreviewDefaultLogicSize(Size
const & rSize);
const Size& GetListBoxPreviewDefaultPixelSize() const;
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx
b/svx/source/tbxctrls/SvxColorValueSet.cxx
index e349083e34aa..9176c00a2a8d 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -36,11 +36,6 @@ FactoryFunction SvxColorValueSet::GetUITestFactory() const
return SvxColorValueSetUIObject::create;
}
-sal_uInt32 SvxColorValueSet::getMaxRowCount()
-{
-return StyleSettings::GetColorValueSetMaximumRowCount();
-}
-
sal_uInt32 SvxColorValueSet::getEntryEdgeLength()
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index bfce93a9736b..66a285288242 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2136,12 +2136,6 @@ StyleSettings::GetColorValueSetColumnCount() const
return mxData->mnColorValueSetColumnCount;
}
-sal_uInt16
-StyleSettings::GetColorValueSetMaximumRowCount()
-{
-return 10;
-}
-
sal_uInt16
StyleSettings::GetListBoxPreviewDefaultLineWidth()
{
___
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/tdf135774_numberingShading.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx| 28 ++
writerfilter/source/dmapper/NumberingManager.cxx |3 -
3 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 43436ef43132eb3ee6c10c0fe50971062677682a
Author: Justin Luth
AuthorDate: Tue Mar 2 07:46:47 2021 +0200
Commit: Justin Luth
CommitDate: Sat Mar 6 12:16:45 2021 +0100
tdf#135774 writerfilter Char highlight: revert tdf#117137
revert my 6.1 commit ac27f4e7abf5339f71d4f5f3fc09a13b25669fe4
tdf#117137: DOCX import: don't try to set grab-bag as UNO prop
The ultimate problems in bug 117137 seem to have been fixed
elsewhere and the unit test still passes after the revert.
(Tested in Word 2016 and 2003).
Also my entire tone was one of uncertainty in the review process.
In general, the grabbags should not be ignored, as they are supposed
to just contain import information that should be exported again.
In this specific case, CharGrabBag is needed to identify that
the background was imported as shading, so that it will still
be exported as shading instead of being converted into a highlight.
If this revert causes problems, then the grabbag will need
to remove the problematic items (or keep only the essential items).
Change-Id: I368fcdfca9057426aa6352f1caa7b552d87905d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111937
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135774_numberingShading.docx
b/sw/qa/extras/ooxmlexport/data/tdf135774_numberingShading.docx
new file mode 100644
index ..9f62ef2a5a21
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf135774_numberingShading.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index b7af0c5e69b2..a819c00e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/";
@@ -27,6 +28,24 @@ class Test : public SwModelTestBase
public:
Test() : SwModelTestBase(DATA_DIRECTORY, "Office Open XML Text") {}
+virtual std::unique_ptr preTest(const char* filename) override
+{
+if (OString(filename) == "tdf135774_numberingShading.docx")
+{
+bool bIsExportAsShading =
SvtFilterOptions::Get().IsCharBackground2Shading();
+// This function is run at the end of the test - returning the
filter options to normal.
+std::unique_ptr pResetter(new Resetter(
+[bIsExportAsShading] () {
+if (bIsExportAsShading)
+SvtFilterOptions::Get().SetCharBackground2Shading();
+}));
+// For these tests, ensure exporting CharBackground as w:highlight.
+SvtFilterOptions::Get().SetCharBackground2Highlighting();
+return pResetter;
+}
+return nullptr;
+}
+
protected:
/**
* Denylist handling
@@ -104,6 +123,15 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf134619_numberingProps, "tdf134619_num
CPPUNIT_ASSERT_EQUAL(72.f, getProperty(xStyle, "CharHeight"));
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf135773_numberingShading,
"tdf135774_numberingShading.docx")
+{
+// This test uses preTest to export CharBackground as Highlight instead of
the 7.0 default of Shading.
+
+// Before the fix, the imported shading was converted into a red highlight.
+xmlDocUniquePtr pXmlStyles = parseExport("word/numbering.xml");
+assertXPath(pXmlStyles,
"/w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:shd",
"fill", "ED4C05");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf139580, "tdf139580.odt")
{
// Without the fix in place, this test would have crashed at export time
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 2143f3b2f04c..ac8a9a4216eb 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -165,10 +165,9 @@ static bool IgnoreForCharStyle(std::u16string_view aStr,
const bool bIsSymbol)
//Names found in PropertyIds.cxx, Lines 56-396
return (aStr==u"Adjust" || aStr==u"IndentAt" || aStr==u"FirstLineIndent"
|| aStr==u"FirstLineOffset" || aStr==u"LeftMargin"
-|| aStr==u"CharInteropGrabBag" || aStr==u"ParaInteropGrabBag" ||
// We need font names when they are different for the bullet and
for the text.
// But leave symbols alone, we only want to keep the font style
for letters and numbers.
-(bIsSymbol && aStr==u"CharFontName")
+|| (bIsSymbol
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationPane.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 92ca16e97856a37a96977187d349e036cd7e5493
Author: Caolán McNamara
AuthorDate: Fri Mar 5 18:47:34 2021 +
Commit: Caolán McNamara
CommitDate: Sat Mar 6 11:48:36 2021 +0100
drop check for visibility before calling updateMotionPathTags
presumably this is effectively always the case
Change-Id: I05ac9075ea340f800cdb9b8fda6e01c8ba1fa186
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112034
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index b816ec57d3c2..1764b4541c2d 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -798,7 +798,7 @@ void CustomAnimationPane::updateMotionPathTags()
pView = xViewShell->GetView();
}
-if( IsVisible() && mpMainSequence && pView )
+if (mpMainSequence && pView)
{
bChanges = updateMotionPathImpl( *this, *pView,
mpMainSequence->getBegin(), mpMainSequence->getEnd(), aTags, maMotionPathTags );
___
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/sidebar/area/AreaPropertyPanelBase.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bdd81c6848e21e4a8123e18f55dfdc63ae08eafe Author: Caolán McNamara AuthorDate: Fri Mar 5 19:02:03 2021 + Commit: Caolán McNamara CommitDate: Sat Mar 6 11:48:15 2021 +0100 use weld::WaitObject Change-Id: I726429b1af2b27310153c069b350ee18c7dea47c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112033 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 5e210968b4a1..903c6701bb04 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -219,9 +219,9 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, ClickImportBitmapHdl, weld::Button&, void return; Graphic aGraphic; -EnterWait(); +auto xWait = std::make_unique(m_xContainer.get()); ErrCode nError = aDlg.GetGraphic( aGraphic ); -LeaveWait(); +xWait.reset(); if( nError != ERRCODE_NONE ) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/swabstdlg.hxx |2 +-
sw/source/ui/dialog/swdlgfact.cxx |2 +-
sw/source/ui/dialog/swdlgfact.hxx |2 +-
sw/source/ui/utlui/swrenamexnameddlg.cxx |4 ++--
sw/source/uibase/inc/swrenamexnameddlg.hxx |2 +-
sw/source/uibase/utlui/content.cxx |2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c6dbd2d0ff3b2adf3fd16221187c4091637b0848
Author: Caolán McNamara
AuthorDate: Fri Mar 5 19:07:02 2021 +
Commit: Caolán McNamara
CommitDate: Sat Mar 6 11:47:36 2021 +0100
allow a widget as a parent, not just a window
Change-Id: I83c3c5a69c0badac7998dfb88107978eee7cdcd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112032
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c29b98214281..b96fc4b8c463 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -433,7 +433,7 @@ public:
virtual VclPtr CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, weld::Window *pParent) = 0;
virtual VclPtr CreateSwFieldEditDlg ( SwView& rVw ) =
0;
-virtual VclPtr
CreateSwRenameXNamedDlg(weld::Window* pParent,
+virtual VclPtr
CreateSwRenameXNamedDlg(weld::Widget* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess) = 0;
virtual VclPtr
CreateSwModalRedlineAcceptDlg(weld::Window *pParent) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 4f1b7e3316d0..56709f9646ce 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -987,7 +987,7 @@ VclPtr
SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg(SwV
return
VclPtr::Create(std::make_unique(rVw));
}
-VclPtr
SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(weld::Window* pParent,
+VclPtr
SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(weld::Widget* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess)
{
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 65870505bda5..15a668c6ea78 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -703,7 +703,7 @@ public:
const SfxItemSet* pItemSet, SwWrtShell* pSh) override;
virtual VclPtr CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, weld::Window *pParent) override;
virtual VclPtr CreateSwFieldEditDlg ( SwView& rVw )
override;
-virtual VclPtr
CreateSwRenameXNamedDlg(weld::Window* pParent,
+virtual VclPtr
CreateSwRenameXNamedDlg(weld::Widget* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess)
override;
virtual VclPtr
CreateSwModalRedlineAcceptDlg(weld::Window *pParent) override;
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx
b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 73993a68f539..bbba12a203a8 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -23,10 +23,10 @@
using namespace ::com::sun::star;
-SwRenameXNamedDlg::SwRenameXNamedDlg(weld::Window* pWin,
+SwRenameXNamedDlg::SwRenameXNamedDlg(weld::Widget* pParent,
uno::Reference< container::XNamed > & xN,
uno::Reference< container::XNameAccess > & xNA )
-: GenericDialogController(pWin,
"modules/swriter/ui/renameobjectdialog.ui", "RenameObjectDialog")
+: GenericDialogController(pParent,
"modules/swriter/ui/renameobjectdialog.ui", "RenameObjectDialog")
, xNamed(xN)
, xNameAccess(xNA)
, m_xNewNameED(m_xBuilder->weld_entry("entry"))
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx
b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index c8ed7dc52536..fee64c7d6681 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -40,7 +40,7 @@ class SwRenameXNamedDlg : public weld::GenericDialogController
DECL_LINK(ModifyHdl, weld::Entry&, void);
public:
-SwRenameXNamedDlg(weld::Window* pParent,
+SwRenameXNamedDlg(weld::Widget* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > &
xNameAccess );
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 605831d3b360..ea338a0a00e8 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -4323,7 +4323,7 @@ void SwContentTree::EditEntry(const weld::TreeIter&
rEntry, EditEntryMode nMode)
aObj >>= xTmp;
uno::Reference< container::XNamed > xNamed(xTmp, uno::UNO_QUERY);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
-
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/sidebar/PageFooterPanel.cxx |2 +-
sw/source/uibase/sidebar/PageHeaderPanel.cxx |2 +-
sw/source/uibase/sidebar/PageStylesPanel.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6fc73b528fb0203f2469a42928e75d1de77b2624
Author: Caolán McNamara
AuthorDate: Fri Mar 5 18:40:44 2021 +
Commit: Caolán McNamara
CommitDate: Sat Mar 6 11:47:10 2021 +0100
check widget existance to detect we're disposed
Change-Id: I0c925206a941e799e692cfae7dcd8efa0697a39e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112031
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx
b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index d4a909cbd88d..0cc1037a829f 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -195,7 +195,7 @@ void PageFooterPanel::NotifyItemUpdate(
const SfxItemState eState,
const SfxPoolItem* pState)
{
-if (IsDisposed())
+if (!mxFooterToggle) //disposed
return;
switch(nSid)
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index ae3f4680d9a4..c47084d14371 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -197,7 +197,7 @@ void PageHeaderPanel::NotifyItemUpdate(
const SfxItemState eState,
const SfxPoolItem* pState)
{
-if (IsDisposed())
+if (!mxHeaderToggle) //disposed
return;
switch(nSid)
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx
b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 071d56f2fbdd..8f4c8d88adb1 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -325,7 +325,7 @@ void PageStylesPanel::NotifyItemUpdate(
const SfxItemState eState,
const SfxPoolItem* pState)
{
-if(IsDisposed())
+if (!mxColumnCount) //disposed
return;
switch(nSid)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/navipi/navipi.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 98e90b72778014921e69680915716ea44c97fa53
Author: Caolán McNamara
AuthorDate: Fri Mar 5 17:09:07 2021 +
Commit: Caolán McNamara
CommitDate: Sat Mar 6 11:46:43 2021 +0100
replace GetOptimalSize with Container::get_preferred_size
Change-Id: Ie014a3e48c1d05a91afd0db969e0af21fa84eb71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112027
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 99594e9113b5..170c14308c9f 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -412,7 +412,7 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB,
vcl::Window* pParent)
eNavMode = NAV_LMODE_AREAS;
SetListMode(eNavMode);
-aExpandedSize = GetOptimalSize();
+aExpandedSize = m_xContainer->get_preferred_size();
m_pInitialFocusWidget = m_xEdCol.get();
}
@@ -790,7 +790,7 @@ void ScNavigatorDlg::SetListMode(NavListMode eMode)
if (pNav)
{
-Size aOptimalSize(GetOptimalSize());
+Size aOptimalSize(m_xContainer->get_preferred_size());
Size aNewSize(pNav->GetOutputSizePixel());
aNewSize.setHeight( eMode == NAV_LMODE_NONE ?
aOptimalSize.Height() : aExpandedSize.Height() );
pNav->SetMinOutputSizePixel(aOptimalSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg officecfg/registry
icon-themes/colibre/cmd/32/ar/continuenumbering.png |binary icon-themes/colibre/cmd/32/continuenumbering.png|binary icon-themes/colibre/cmd/ar/lc_continuenumbering.png |binary icon-themes/colibre/cmd/ar/sc_continuenumbering.png |binary icon-themes/colibre/cmd/lc_continuenumbering.png|binary icon-themes/colibre/cmd/sc_continuenumbering.png|binary icon-themes/colibre/links.txt |9 + icon-themes/colibre_svg/cmd/32/ar/continuenumbering.svg |1 + icon-themes/colibre_svg/cmd/32/continuenumbering.svg|1 + icon-themes/colibre_svg/cmd/ar/lc_continuenumbering.svg |1 + icon-themes/colibre_svg/cmd/ar/sc_continuenumbering.svg |1 + icon-themes/colibre_svg/cmd/lc_continuenumbering.svg|1 + icon-themes/colibre_svg/cmd/sc_continuenumbering.svg|1 + officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |3 +++ 14 files changed, 18 insertions(+) New commits: commit 2866cfbd606843dedb21c5c88f4f93771e5f6c9c Author: Rizal Muttaqin AuthorDate: Fri Mar 5 11:24:08 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sat Mar 6 10:50:20 2021 +0100 tdf#126689 Colibre: Continue Previous Numbering icons Change-Id: Idd44b9ec7fdadf7c8af6253623de1b0ad123af99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111984 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/ar/continuenumbering.png b/icon-themes/colibre/cmd/32/ar/continuenumbering.png new file mode 100644 index ..3b339b5c7968 Binary files /dev/null and b/icon-themes/colibre/cmd/32/ar/continuenumbering.png differ diff --git a/icon-themes/colibre/cmd/32/continuenumbering.png b/icon-themes/colibre/cmd/32/continuenumbering.png new file mode 100644 index ..894956ded7b9 Binary files /dev/null and b/icon-themes/colibre/cmd/32/continuenumbering.png differ diff --git a/icon-themes/colibre/cmd/ar/lc_continuenumbering.png b/icon-themes/colibre/cmd/ar/lc_continuenumbering.png new file mode 100644 index ..ac2b4bc83eb9 Binary files /dev/null and b/icon-themes/colibre/cmd/ar/lc_continuenumbering.png differ diff --git a/icon-themes/colibre/cmd/ar/sc_continuenumbering.png b/icon-themes/colibre/cmd/ar/sc_continuenumbering.png new file mode 100644 index ..c2f4d4aaf900 Binary files /dev/null and b/icon-themes/colibre/cmd/ar/sc_continuenumbering.png differ diff --git a/icon-themes/colibre/cmd/lc_continuenumbering.png b/icon-themes/colibre/cmd/lc_continuenumbering.png new file mode 100644 index ..23b84c27c0d1 Binary files /dev/null and b/icon-themes/colibre/cmd/lc_continuenumbering.png differ diff --git a/icon-themes/colibre/cmd/sc_continuenumbering.png b/icon-themes/colibre/cmd/sc_continuenumbering.png new file mode 100644 index ..bca2af5d94b7 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_continuenumbering.png differ diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 4e729952ba5c..294844cd757e 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -408,6 +408,7 @@ cmd/32/fa/alphalowliststyle.png cmd/32/ar/alphalowliststyle.png cmd/32/fa/bulletliststyle.png cmd/32/ar/defaultbullet.png cmd/32/fa/bulletsandnumberingdialog.png cmd/32/ar/bulletsandnumberingdialog.png cmd/32/fa/chapternumberingdialog.png cmd/32/ar/chapternumberingdialog.png +cmd/32/fa/continuenumbering.png cmd/32/ar/continuenumbering.png cmd/32/fa/defaultbullet.png cmd/32/ar/defaultbullet.png cmd/32/fa/defaultnumbering.png cmd/32/ar/defaultnumbering.png cmd/32/fa/deleterecord.png cmd/32/ar/deleterecord.png @@ -440,6 +441,7 @@ cmd/32/he/alphalowliststyle.png cmd/32/ar/alphalowliststyle.png cmd/32/he/bulletliststyle.png cmd/32/ar/defaultbullet.png cmd/32/he/bulletsandnumberingdialog.png cmd/32/ar/bulletsandnumberingdialog.png cmd/32/he/chapternumberingdialog.png cmd/32/ar/chapternumberingdialog.png +cmd/32/he/continuenumbering.png cmd/32/ar/continuenumbering.png cmd/32/he/defaultbullet.png cmd/32/ar/defaultbullet.png cmd/32/he/defaultnumbering.png cmd/32/ar/defaultnumbering.png cmd/32/he/deleterecord.png cmd/32/ar/deleterecord.png @@ -526,6 +528,7 @@ cmd/32/ur/alphalowliststyle.png cmd/32/ar/alphalowliststyle.png cmd/32/ur/bulletliststyle.png cmd/32/ar/defaultbullet.png cmd/32/ur/bulletsandnumberingdialog.png cmd/32/ar/bulletsandnumberingdialog.png cmd/32/ur/chapternumberingdialog.png cmd/32/ar/chapternumberingdialog.png +cmd/32/ur/continuenumbering.png cmd/32/ar/continuenumbering.png cmd/32/ur/defaultbullet.png cmd/32/ar/defaultbullet.png cmd/32/ur/defaultnumbering.png cmd/32/ar/defaultnumbering.png cmd/32/ur/deleterecord.png cmd/32/ar/deleterecord.png @@ -572,6 +575,7 @@ cmd/fa/lc_alphalowliststyle.png cmd/ar/lc_a
[Libreoffice-commits] core.git: include/sfx2 sw/inc sw/source
include/sfx2/tabdlg.hxx |4 +++-
sw/inc/strings.hrc| 11 ++-
sw/source/ui/fmtui/tmpdlg.cxx | 13 +++--
3 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 4902e3231f4f5f4df32d46a901801b18c297ef15
Author: Heiko Tietze
AuthorDate: Fri Mar 5 09:14:44 2021 +0100
Commit: Heiko Tietze
CommitDate: Sat Mar 6 09:54:55 2021 +0100
Related tdf#128469 - Customization of tab dialog buttons
Change-Id: Ib7d4bbc6d78ac93510835e061640bfcd99248195
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111987
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 9afebad1ba58..6397868a21d0 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -138,8 +138,10 @@ public:
virtual weld::Button& GetOKButton() const override { return *m_xOKBtn; }
weld::Button& GetCancelButton() const { return *m_xCancelBtn; }
-weld::Button& GetStandardButton() const { return *m_xBaseFmtBtn; }
weld::Button* GetUserButton() const { return m_xUserBtn.get(); }
+weld::Button* GetStandardButton() const { return
m_xBaseFmtBtn.get(); }
+weld::Button* GetApplyButton() const { return m_xApplyBtn.get(); }
+weld::Button* GeResetButton() const { return m_xResetBtn.get(); }
voidRemoveResetButton();
voidRemoveStandardButton();
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 45fe987ddf3e..eaccff12b94a 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -23,8 +23,17 @@
#define NC_(Context, String) reinterpret_cast(Context "\004"
u8##String)
#define NNC_(Context, StringSingular, StringPlural) reinterpret_cast(Context "\004" u8##StringSingular "\004" u8##StringPlural)
+// Dialog buttons
+#define STR_STANDARD_LABEL NC_("STR_STANDARD_LABEL", "Set
to ~Parent")
+#define STR_STANDARD_TOOLTIPNC_("STR_STANDARD_TOOLTIP", "")
+#define STR_STANDARD_EXTENDEDTIP
NC_("STR_STANDARD_EXTENDEDTIP", "")
+#define STR_RESET_LABEL NC_("STR_RESET_LABEL", "Reset")
+#define STR_RESET_TOOLTIP NC_("STR_RESET_TOOLTIP", "")
+#define STR_RESET_EXTENDEDTIP NC_("STR_RESET_EXTENDEDTIP",
"")
+#define STR_APPLY_LABEL NC_("STR_APPLY_LABEL", "Apply")
+#define STR_APPLY_TOOLTIP NC_("STR_APPLY_TOOLTIP", "")
+#define STR_APPLY_EXTENDEDTIP NC_("STR_APPLY_EXTENDEDTIP",
"")
-#define STR_STANDARD_ACTION NC_("STR_STANDARD_ACTION",
"Set to ~Parent")
// Format names
#define STR_POOLCHR_STANDARDNC_("STR_POOLCHR_STANDARD",
"Default Character Style")
#define STR_POOLCHR_FOOTNOTENC_("STR_POOLCHR_FOOTNOTE",
"Footnote Characters")
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index ae69c35093d3..cfab577c82dd 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -77,8 +77,17 @@
SwTemplateDlgController::SwTemplateDlgController(weld::Window* pParent,
nHtmlMode = ::GetHtmlMode(pWrtShell->GetView().GetDocShell());
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-weld::Button& pStandardButton(GetStandardButton());
-pStandardButton.set_label(SwResId(STR_STANDARD_ACTION));
+GetStandardButton()->set_label(SwResId(STR_STANDARD_LABEL));
+GetStandardButton()->set_tooltip_text(SwResId(STR_STANDARD_TOOLTIP));
+
GetStandardButton()->set_accessible_description(SwResId(STR_STANDARD_EXTENDEDTIP));
+
+GetApplyButton()->set_label(SwResId(STR_APPLY_LABEL));
+GetApplyButton()->set_tooltip_text(SwResId(STR_APPLY_TOOLTIP));
+
GetApplyButton()->set_accessible_description(SwResId(STR_APPLY_EXTENDEDTIP));
+
+GeResetButton()->set_label(SwResId(STR_RESET_LABEL));
+GeResetButton()->set_tooltip_text(SwResId(STR_RESET_TOOLTIP));
+
GeResetButton()->set_accessible_description(SwResId(STR_RESET_EXTENDEDTIP));
// stitch TabPages together
switch( nRegion )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
