[Libreoffice-commits] core.git: vcl/inc
vcl/inc/skia/utils.hxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 4374e57dd337c9be37431339323cf78dad66dd3e
Author: Luboš Luňák
AuthorDate: Wed Sep 30 19:32:15 2020 +0200
Commit: Luboš Luňák
CommitDate: Fri Oct 2 07:26:15 2020 +0200
add operator<< for SkMatrix
Change-Id: Ib3b0cd624e52ffcd765bb2ac48cafd6abfc476cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103744
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/inc/skia/utils.hxx b/vcl/inc/skia/utils.hxx
index 222a413b511e..473edfdf0d3f 100644
--- a/vcl/inc/skia/utils.hxx
+++ b/vcl/inc/skia/utils.hxx
@@ -115,6 +115,15 @@ inline std::basic_ostream&
operator<<(std::basic_ostream
+inline std::basic_ostream& operator<<(std::basic_ostream& stream,
+ const SkMatrix& matrix)
+{
+return stream << "[" << matrix[0] << " " << matrix[1] << " " << matrix[2]
<< "]"
+ << "[" << matrix[3] << " " << matrix[4] << " " << matrix[5]
<< "]"
+ << "[" << matrix[6] << " " << matrix[7] << " " << matrix[8]
<< "]";
+}
+
template
inline std::basic_ostream& operator<<(std::basic_ostream& stream,
const SkImage& image)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa vcl/skia
vcl/qa/cppunit/skia/skia.cxx | 111 ++-
vcl/skia/gdiimpl.cxx | 30 +--
2 files changed, 125 insertions(+), 16 deletions(-)
New commits:
commit c1206e12eab237ffa7dde728da5bf1883a05ddb0
Author: Luboš Luňák
AuthorDate: Wed Sep 30 18:39:39 2020 +0200
Commit: Luboš Luňák
CommitDate: Fri Oct 2 07:25:26 2020 +0200
SkCanvas::drawPaint() -> drawRect(), where applicable, and fix matrix
It makes the code a bit simpler. Also fix the matrix used
in SkiaSalGraphicsImpl::drawShader(), plus add asserts to verify
it's correct.
Change-Id: Ia6692ad90e822e6e44028b280dc2faaac06959a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103743
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx
index 07f5a872ddbb..28591d807bb1 100644
--- a/vcl/qa/cppunit/skia/skia.cxx
+++ b/vcl/qa/cppunit/skia/skia.cxx
@@ -11,7 +11,11 @@
#include
#include
-#include
+#include
+#include
+#include
+#include
+#include
// This tests backends that use Skia (i.e. intentionally not the svp one,
which is the default.)
// Note that you still may need to actually set for Skia to be used (see
vcl/README.vars).
@@ -27,10 +31,29 @@ public:
}
void testBitmapErase();
+void testDrawShaders();
CPPUNIT_TEST_SUITE(SkiaTest);
CPPUNIT_TEST(testBitmapErase);
+CPPUNIT_TEST(testDrawShaders);
CPPUNIT_TEST_SUITE_END();
+
+private:
+#if 0
+template // handle both Bitmap and BitmapEx
+void savePNG(const OUString& sWhere, const BitmapT& rBmp)
+{
+SvFileStream aStream(sWhere, StreamMode::WRITE | StreamMode::TRUNC);
+GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+rFilter.compressAsPNG(BitmapEx(rBmp), aStream);
+}
+void savePNG(const OUString& sWhere, const ScopedVclPtr&
device)
+{
+SvFileStream aStream(sWhere, StreamMode::WRITE | StreamMode::TRUNC);
+GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+rFilter.compressAsPNG(device->GetBitmapEx(Point(),
device->GetOutputSizePixel()), aStream);
+}
+#endif
};
void SkiaTest::testBitmapErase()
@@ -62,6 +85,92 @@ void SkiaTest::testBitmapErase()
CPPUNIT_ASSERT(!skiaBitmap->unittestHasEraseColor());
}
+// Test that draw calls that internally result in SkShader calls work properly.
+void SkiaTest::testDrawShaders()
+{
+if (!SkiaHelper::isVCLSkiaEnabled())
+return;
+ScopedVclPtr device =
VclPtr::Create(DeviceFormat::DEFAULT);
+device->SetOutputSizePixel(Size(20, 20));
+device->SetBackground(Wallpaper(COL_WHITE));
+device->Erase();
+Bitmap bitmap(Size(10, 10), 24);
+bitmap.Erase(COL_RED);
+SkiaSalBitmap* skiaBitmap =
dynamic_cast(bitmap.ImplGetSalBitmap().get());
+CPPUNIT_ASSERT(skiaBitmap);
+CPPUNIT_ASSERT(skiaBitmap->PreferSkShader());
+AlphaMask alpha(Size(10, 10));
+alpha.Erase(64);
+SkiaSalBitmap* skiaAlpha =
dynamic_cast(alpha.ImplGetSalBitmap().get());
+CPPUNIT_ASSERT(skiaAlpha);
+CPPUNIT_ASSERT(skiaAlpha->PreferSkShader());
+
+device->DrawBitmap(Point(5, 5), bitmap);
+//savePNG("/tmp/a1.png", device);
+// Check that the area is painted, but nothing else.
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, device->GetPixel(Point(0, 0)));
+CPPUNIT_ASSERT_EQUAL(COL_RED, device->GetPixel(Point(5, 5)));
+CPPUNIT_ASSERT_EQUAL(COL_RED, device->GetPixel(Point(14, 14)));
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, device->GetPixel(Point(15, 15)));
+device->Erase();
+
+device->DrawBitmapEx(Point(5, 5), BitmapEx(bitmap, alpha));
+//savePNG("/tmp/a2.png", device);
+Color resultRed(COL_RED.GetRed() * 3 / 4 + 64, 64, 64); // 3/4 red, 1/4
white
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, device->GetPixel(Point(0, 0)));
+CPPUNIT_ASSERT_EQUAL(resultRed, device->GetPixel(Point(5, 5)));
+CPPUNIT_ASSERT_EQUAL(resultRed, device->GetPixel(Point(14, 14)));
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, device->GetPixel(Point(15, 15)));
+device->Erase();
+
+basegfx::B2DHomMatrix matrix;
+matrix.scale(10, 10);
+matrix.rotate(M_PI / 4);
+device->DrawTransformedBitmapEx(matrix, BitmapEx(bitmap, alpha));
+//savePNG("/tmp/a3.png", device);
+CPPUNIT_ASSERT_EQUAL(resultRed, device->GetPixel(Point(0, 1)));
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, device->GetPixel(Point(1, 0)));
+CPPUNIT_ASSERT_EQUAL(resultRed, device->GetPixel(Point(0, 10)));
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, device->GetPixel(Point(10, 10)));
+device->Erase();
+
+// Test with scaling. Use everything 10x larger to reduce the impact of
smoothscaling.
+ScopedVclPtr deviceLarge =
VclPtr::Create(DeviceFormat::DEFAULT);
+deviceLarge->SetOutputSizePixel(Size(200, 200));
+deviceLarge->SetBackground(Wallpaper(COL_WHITE));
+deviceLarge->Erase();
+Bitmap bitmapLarge(Size(100, 100), 24);
+bitmapLarge.Erase(COL_RED);
+Sk
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0401.xhp |6 +++--- source/text/shared/01/0110.xhp |6 +++--- source/text/shared/01/0117.xhp |4 ++-- source/text/swriter/main0101.xhp |5 + 4 files changed, 9 insertions(+), 12 deletions(-) New commits: commit 124788c0f8068bca7e0842f9e148889ba1335d02 Author: Seth Chaiklin AuthorDate: Thu Oct 1 21:57:51 2020 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Fri Oct 2 05:17:08 2020 +0200 tdf#137084 adjust label for "Exit" and "Properties" in menu help pages - "exit" --> "Exit %PRODUCTNAME" - "Document Properties" --> "Properties" - update ,, Change-Id: Ifa40ff45965eee95cb20a7a2e0307e34880419b6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103667 Reviewed-by: Seth Chaiklin Reviewed-by: Adolfo Jayme Barrientos Tested-by: Jenkins diff --git a/source/text/shared/00/0401.xhp b/source/text/shared/00/0401.xhp index 68ab3658e..f131e9e5d 100644 --- a/source/text/shared/00/0401.xhp +++ b/source/text/shared/00/0401.xhp @@ -178,7 +178,7 @@ Choose File - Reload. -Choose File - Properties. +Choose File - Properties. Choose File - Properties - General tab. Choose File - Digital Signatures - Sign Existing PDF. @@ -330,8 +330,8 @@ -Choose File - Exit. -CommandCtrl+Q +Choose File - Exit %PRODUCTNAME. +CommandCtrl+Q Choose File - New - Master Document. diff --git a/source/text/shared/01/0110.xhp b/source/text/shared/01/0110.xhp index b37334dac..c14344ce4 100644 --- a/source/text/shared/01/0110.xhp +++ b/source/text/shared/01/0110.xhp @@ -22,15 +22,15 @@ -Document Properties +Properties /text/shared/01/0110.xhp -Document Properties - +Properties + Displays the properties for the current file, including statistics such as word count and the date the file was created. UFI: removed a note diff --git a/source/text/shared/01/0117.xhp b/source/text/shared/01/0117.xhp index ad5f373c7..4380f7afa 100644 --- a/source/text/shared/01/0117.xhp +++ b/source/text/shared/01/0117.xhp @@ -30,8 +30,8 @@ exiting;$[officename] mw made "exiting..." a two level entry -Exit - Closes all $[officename] programs and prompts you to save your changes. This command does not exist on macOS systems. +Exit %PRODUCTNAME + Closes all %PRODUCTNAME programs and prompts you to save your changes. This command does not exist on macOS systems. diff --git a/source/text/swriter/main0101.xhp b/source/text/swriter/main0101.xhp index 1d4c1018d..7c0141c4f 100644 --- a/source/text/swriter/main0101.xhp +++ b/source/text/swriter/main0101.xhp @@ -26,12 +26,10 @@ - - -File +File These commands apply to the current document, open a new document, or close the application. @@ -59,5 +57,4 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |6 ++ 1 file changed, 6 insertions(+) New commits: commit 0227a8494463ef1c035ba3477ddf4c62c289edd0 Author: Jan-Marek Glogowski AuthorDate: Fri Oct 2 02:47:15 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Fri Oct 2 04:43:55 2020 +0200 gpgme, coinmp, firebird: disable on Windows Arm64 There is currently no gpgme package for Arm64, coinmp uses MSbuild, which probably just needs an additional ARM64 build target via VS. Firebird configure fails with cross-build errors, and I simply stopped early trying to fix them. I'm actually wondering, why LO doesn't use the VS solutions to build Firebird on Windows. Change-Id: I3acbe91e1df287afd557a07b48e3db46b31e6d95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103781 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski diff --git a/configure.ac b/configure.ac index e235dabcc8b1..da140708196b 100644 --- a/configure.ac +++ b/configure.ac @@ -699,6 +699,12 @@ cygwin*|interix*) DLLPOST=".dll" LINKFLAGSNOUNDEFS= + +if test "$host_cpu" = "aarch64"; then +enable_gpgmepp=no +enable_coinmp=no +enable_firebird_sdbc=no +fi ;; darwin*|macos*) # macOS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/skia
external/skia/Library_skia.mk |4 1 file changed, 4 insertions(+) New commits: commit 77ba9a095b0b3f429e006571e16f8320ba0bb61e Author: Jan-Marek Glogowski AuthorDate: Thu Oct 1 23:02:38 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Fri Oct 2 04:32:01 2020 +0200 skia: fix Windows Arm64 build This uses MSVC instead of clang for this host. Change-Id: Idf96668e00563be12a7819a1658b657673733d21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103780 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 7712c6be9e77..643c41a4ce38 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -13,8 +13,12 @@ $(eval $(call gb_Library_set_warnings_disabled,skia)) $(eval $(call gb_Library_use_unpacked,skia,skia)) +ifneq ($(OS)_$(CPUNAME),WNT_ARM64) $(eval $(call gb_Library_use_clang,skia)) $(eval $(call gb_Library_set_clang_precompiled_header,skia,external/skia/inc/pch/precompiled_skia)) +else +$(eval $(call gb_Library_set_precompiled_header,skia,external/skia/inc/pch/precompiled_skia)) +endif $(eval $(call gb_Library_add_defs,skia,\ -DSKIA_IMPLEMENTATION=1 \ ___ 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/swriter/guide/background.xhp | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit cd0f383f6efc9a937af1f0e9fe00a537195529a3 Author: Seth Chaiklin AuthorDate: Fri Oct 2 02:20:14 2020 +0200 Commit: Seth Chaiklin CommitDate: Fri Oct 2 02:39:28 2020 +0200 tdf#96496 update tabnames for defining background colors -change tab names for Character and Paragraph -update to Change-Id: I156dfb469d15b811c5817e880b6a3ff6148c7fd3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103790 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/swriter/guide/background.xhp b/source/text/swriter/guide/background.xhp index b64ffcb63..3ebf7c665 100644 --- a/source/text/swriter/guide/background.xhp +++ b/source/text/swriter/guide/background.xhp @@ -1,6 +1,5 @@ - - Defining Background Colors or Background Graphics @@ -44,10 +42,10 @@ Select the characters. -Choose Format - Character. +Choose Format - Character. -Click the Background tab, select the background color. +Click the Highlighting tab, select the background color. To Apply a Background To a Paragraph @@ -59,7 +57,7 @@ Choose Format - Paragraph. -On the Background tab page, select the background color or a background graphic. +On the Area tab page, select the background color or a background graphic. To select an object in the background, hold down the CommandCtrl key and click the object. Alternatively, use the Navigator to select the object. @@ -69,7 +67,7 @@ Place the cursor in the table in your text document. -Choose Table - Properties. +Choose Table - Properties. On the Background tab page, select the background color or a background graphic. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/00040500.xhp|6 ++-- source/text/shared/01/06050500.xhp| 37 -- source/text/swriter/guide/numbering_paras.xhp | 14 - 3 files changed, 28 insertions(+), 29 deletions(-) New commits: commit e0ceb4271ff710ba2cd0c2d385f58386612bb3e7 Author: Seth Chaiklin AuthorDate: Thu Oct 1 18:34:45 2020 +0200 Commit: Seth Chaiklin CommitDate: Fri Oct 2 02:12:38 2020 +0200 tdf#137190 change "Options" to "Customize" in Customize help page - change "Options" to "Customize" in howto access - change title of help page to "Customize" - add caseinline for Writer only - update to , , , , - change German section name - change "Options" to "Customize" in guide page Change-Id: Idf958b1982346f3bf6410e0eaed536fe8ecea832 Change-Id: Idf958b1982346f3bf6410e0eaed536fe8ecea832 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103666 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/shared/00/00040500.xhp b/source/text/shared/00/00040500.xhp index dd8eb4a2c..319616235 100644 --- a/source/text/shared/00/00040500.xhp +++ b/source/text/shared/00/00040500.xhp @@ -261,14 +261,14 @@ - -Choose Format - Bullets and Numbering. Open Options tab page. + +Choose Format - Bullets and Numbering. Open Customize tab page. Open Styles - Presentation Styles - context menu of an Outline Style - choose New/Modify. -Open Styles - List Styles - context menu of an entry - choose New/Modify. +Open Styles - List Styles - context menu of an entry - choose New/Modify. diff --git a/source/text/shared/01/06050500.xhp b/source/text/shared/01/06050500.xhp index 5b466cdbe..f07e32af7 100644 --- a/source/text/shared/01/06050500.xhp +++ b/source/text/shared/01/06050500.xhp @@ -19,10 +19,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - Options + Customize (Bullets and Numbering) /text/shared/01/06050500.xhp @@ -34,19 +33,19 @@ -Customize +Customize Sets the formatting options for numbered or bulleted lists. If you want, you can apply formatting to individual levels in the list hierarchy. - + Select the level(s) that you want to modify, and then specify the formatting that you want to use. -Level +Level Select the level(s) that you want to define the formatting options for. The selected level is highlighted in the preview. -Number +Number -Numbering +Numbering Select a numbering style for the selected levels. @@ -194,37 +193,37 @@ Select a color for the current numbering style. -Relative size +Relative size Relative size - + Enter the amount by which you want to resize the bullet character with respect to the font height of the current paragraph. -Options for graphics: +Options for graphics: -Select... +Select... Select the graphic, or locate the graphic file that you want to use as a bullet. -Width +Width Enter a width for the graphic. -Height +Height Enter a height for the graphic. -Keep ratio +Keep ratio Maintains the size proportions of the graphic. -Alignment +Alignment Select the alignment option for the graphic. - All levels - + All levels + Set the numbering options for all of the levels. -Consecutive numbering - +Consecutive numbering + Increases the numbering by one as you go down each level in the list hierarchy. diff --git a/source/text/swriter/guide/numbering_paras.xhp b/source/text/swriter/guide/numbering_paras.xhp index 66ee88740..4bf7f70de 100644 --- a/source/text/swriter/guide/numbering_paras.xhp +++ b/source/text/swriter/guide/numbering_paras.xhp @@ -37,11 +37,11 @@ MW changed "removing;..." to "deleting;...", and deleted "modifying;..." -Modifying Numbering in a Numbered List +Modifying Numbering in a Numbered List You can remove the numbering from a paragraph in a numbered list or change the number that a numbered list starts with. -If you want numbered headings, use the Tools - Chapter Numbering menu command to assign a numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar. +If you want numbered headings, use the Tools - Chapter Numbering menu command to assign a numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar. -To Remove the Number From a Paragraph in a Numbered List +To Remove the Number From a Paragraph in a Numbered List @@ -60,14 +60,14 @@ To remove the number and the indent of the paragraph, click the Numbering on/off icon on the Formatting Bar. If you save the document in HTML format, a separate numbered li
[Libreoffice-commits] core.git: external/icu
external/icu/ExternalProject_icu.mk |2
external/icu/UnpackedTarball_icu.mk |4
external/icu/icu4c-win-arm64.patch.1| 76 -
external/icu/icu4c-windows-cygwin-cross.patch.1 | 131
4 files changed, 133 insertions(+), 80 deletions(-)
New commits:
commit 7f16cabf00daa30e9284d2fb2494bd341352c25e
Author: Jan-Marek Glogowski
AuthorDate: Thu Oct 1 11:20:50 2020 +0200
Commit: Jan-Marek Glogowski
CommitDate: Thu Oct 1 21:09:24 2020 +0200
icu: fix Windows Cygwin cross build
This replaces the previous, broken Windows ARM64 solution with a
general fix for Cygwin cross-building. The main problem is the
PATH environment, because that is colon-seperated on Cygwin, like
on Unix, so won't work with any absolute "Windows" path, which is
needed for the --with-cross-build option.
One general change is the adoption of icucross.inc. I don't know,
why that should prefer the general CURR_FULL_DIR from icudefs.mk
over the specific one in @platform_make_fragment@. That breaks
here, because it returns a cygwin unix path, which is used as
an option to compiled tools, which these won't be able to handle.
Change-Id: Ic2cf15b48801ac57ea5a8a2876ce59f2a84edfb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103759
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/external/icu/ExternalProject_icu.mk
b/external/icu/ExternalProject_icu.mk
index 855534f0a405..3ded08562211 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -29,7 +29,6 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug
--disable-release) \
$(if
$(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source \
- $(if
$(GNUMAKE_WIN_NATIVE),--enable-native-make) \
--disable-tools --disable-extras) \
&& $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) $(if
$(verbose),VERBOSE=1) \
,source)
@@ -67,6 +66,7 @@ icu_LDFLAGS:=" \
$(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_Trace_StartRange,icu,EXTERNAL)
$(call gb_ExternalProject_run,build,\
+ autoconf && \
CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
PYTHONWARNINGS="default" \
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index 552c578ae6cf..002b7d28cab5 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -41,9 +41,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/strict_ansi.patch \
external/icu/icu4c-link-scrptrun.patch.2 \
- $(if $(CROSS_COMPILING),\
- $(if $(filter
WNT_ARM64,$(OS)_$(CPUNAME)),external/icu/icu4c-win-arm64.patch.1) \
- )\
+ external/icu/icu4c-windows-cygwin-cross.patch.1 \
))
$(eval $(call
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-win-arm64.patch.1
b/external/icu/icu4c-win-arm64.patch.1
deleted file mode 100644
index 272310fed845..
--- a/external/icu/icu4c-win-arm64.patch.1
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ur icu.org/source/acinclude.m4 icu/source/acinclude.m4
icu.org/source/acinclude.m4 2020-04-10 16:22:16.0 +0200
-+++ icu/source/acinclude.m4 2020-04-21 22:14:09.940217733 +0200
-@@ -52,6 +52,12 @@
- else
- icu_cv_host_frag=mh-cygwin-msvc
- fi ;;
-+aarch64-*-cygwin)
-+ if test "$GCC" = yes; then
-+ icu_cv_host_frag=mh-cygwin64
-+ else
-+ icu_cv_host_frag=mh-cygwin-msvc
-+ fi ;;
- *-*-mingw*)
- if test "$GCC" = yes; then
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-diff -ur icu.org/source/configure.ac icu/source/configure.ac
icu.org/source/configure.ac 2020-04-10 16:22:16.0 +0200
-+++ icu/source/configure.ac 2020-04-21 22:14:09.940217733 +0200
-@@ -252,6 +252,23 @@
- fi
- fi
- AC_SUBST(cross_buildroot)
-+
-+native_make="no"
-+ENABLE_RELEASE=1
-+AC_ARG_ENABLE(native-make,
-+[ --enable-native-makebuild with naive make (Cygwin only)
[default=no]],
-+[ case "${enableval}" in
-+ yes|"") native_make="yes" ;;
-+ esac ],
-+)
-+
-+cross_path_buildroot="$cross_buildroot"
-+if test "x$native_make" = "xyes"; then
-+case "${host}" in
-+*-*-cygwin*) cross_path_buildroot=$(cygpath -u "$cross_buildroot") ;;
-+esac
-+fi
-+AC_SUBST(cross_path_buildroot
[Libreoffice-commits] core.git: include/svl svl/source sw/source
include/svl/undo.hxx|2 +-
svl/source/undo/undo.cxx| 12
sw/source/core/undo/docundo.cxx |6 --
3 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 0b3ff97d7d5a1e8471e494f4141165364203c192
Author: Xisco Fauli
AuthorDate: Thu Oct 1 16:46:11 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 1 20:54:53 2020 +0200
tdf#136728: Revert "tdf#136238 speed up deleting large cross page table"
This reverts commit da5c289a9cae5d914937f235694fd5b0cb92547f.
Change-Id: Ic6a77ec2cd3b502fb4e94159a0424340850590df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103665
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 0847d89811c0..2757967aaee4 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -291,7 +291,7 @@ public:
/** removes the oldest Undo actions from the stack
*/
-voidRemoveOldestUndoActions(sal_Int32 nNumToDelete);
+voidRemoveOldestUndoAction();
void dumpAsXml(xmlTextWriterPtr pWriter) const;
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 46c785557416..b678fba83948 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -1123,22 +1123,18 @@ bool SfxUndoManager::HasTopUndoActionMark(
UndoStackMark const i_mark )
}
-void SfxUndoManager::RemoveOldestUndoActions(sal_Int32 nNumToDelete)
+void SfxUndoManager::RemoveOldestUndoAction()
{
UndoManagerGuard aGuard( *m_xData );
-if ( ImplIsInListAction_Lock() && ( m_xData->pUndoArray->nCurUndoAction ==
1 ) )
+if ( IsInListAction() && ( m_xData->pUndoArray->nCurUndoAction == 1 ) )
{
assert(!"SfxUndoManager::RemoveOldestUndoActions: cannot remove a
not-yet-closed list action!");
return;
}
-while (nNumToDelete>0 && !m_xData->pUndoArray->maUndoActions.empty())
-{
-aGuard.markForDeletion( m_xData->pUndoArray->Remove( 0 ) );
---m_xData->pUndoArray->nCurUndoAction;
---nNumToDelete;
-}
+aGuard.markForDeletion( m_xData->pUndoArray->Remove( 0 ) );
+--m_xData->pUndoArray->nCurUndoAction;
ImplCheckEmptyActions();
}
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 8f870f347d6c..6e350836fc20 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -537,8 +537,10 @@ void
UndoManager::AddUndoAction(std::unique_ptr pAction, bool bTr
}
// if the undo nodes array is too large, delete some actions
-if (UNDO_ACTION_LIMIT < GetUndoNodes().Count())
-RemoveOldestUndoActions(GetUndoNodes().Count() - UNDO_ACTION_LIMIT);
+while (UNDO_ACTION_LIMIT < GetUndoNodes().Count())
+{
+RemoveOldestUndoAction();
+}
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/icu
external/icu/ExternalProject_icu.mk |8 ++--- external/icu/UnpackedTarball_icu.mk |1 external/icu/icu4c-link-scrptrun.patch.2 | 43 +++ 3 files changed, 48 insertions(+), 4 deletions(-) New commits: commit 695c2b5cba265a58232fbda23f8284fc320ce8b6 Author: Jan-Marek Glogowski AuthorDate: Thu Oct 1 11:19:25 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Thu Oct 1 19:56:29 2020 +0200 icu: fix Windows extras build Based on an upstream patch, with an additional hunk to fix the debug build. Gets rid of a difference between Windows and other builds. Change-Id: I597a5cb429fb3257535d8a2ce1142f5f9f34cebe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103758 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index b9fb3f497971..855534f0a405 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -29,8 +29,8 @@ $(call gb_ExternalProject_get_state_target,icu,build) : $(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source \ - $(if $(GNUMAKE_WIN_NATIVE),--enable-native-make)) \ - --disable-extras \ + $(if $(GNUMAKE_WIN_NATIVE),--enable-native-make) \ + --disable-tools --disable-extras) \ && $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) $(if $(verbose),VERBOSE=1) \ ,source) $(call gb_Trace_EndRange,icu,EXTERNAL) @@ -73,7 +73,6 @@ $(call gb_ExternalProject_get_state_target,icu,build) : ./configure \ --disable-layout --disable-samples \ $(if $(filter FUZZERS,$(BUILD_TYPE)),--disable-release) \ - $(if $(CROSS_COMPILING),--disable-tools --disable-extras) \ $(if $(filter iOS ANDROID,$(OS)),--disable-dyload) \ $(if $(filter ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \ $(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \ @@ -81,7 +80,8 @@ $(call gb_ExternalProject_get_state_target,icu,build) : --with-data-packaging=static --enable-static --disable-shared --disable-dyload,\ --disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\ - --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \ + --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source \ + --disable-tools --disable-extras) \ && $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) $(if $(verbose),VERBOSE=1) \ $(if $(filter MACOSX,$(OS)), \ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \ diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 9638f4fb9b0e..552c578ae6cf 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -40,6 +40,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/Wdeprecated-copy-dtor.patch \ external/icu/icu4c-khmerbreakengine.patch.1 \ external/icu/strict_ansi.patch \ + external/icu/icu4c-link-scrptrun.patch.2 \ $(if $(CROSS_COMPILING),\ $(if $(filter WNT_ARM64,$(OS)_$(CPUNAME)),external/icu/icu4c-win-arm64.patch.1) \ )\ diff --git a/external/icu/icu4c-link-scrptrun.patch.2 b/external/icu/icu4c-link-scrptrun.patch.2 new file mode 100644 index ..8c94361a163c --- /dev/null +++ b/external/icu/icu4c-link-scrptrun.patch.2 @@ -0,0 +1,43 @@ +Based on: https://github.com/unicode-org/icu/commit/e3f2c0dd70018d924bf22a9b3f0cbf387316b50b.patch + +From e3f2c0dd70018d924bf22a9b3f0cbf387316b50b Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Wed, 5 Aug 2020 13:18:30 -0400 +Subject: [PATCH] ICU-21217 Windows: Fix link command for extra/scrptrun + +--- + icu4c/source/extra/scrptrun/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/icu4c/source/extra/scrptrun/Makefile.in b/icu4c/source/extra/scrptrun/Makefile.in +index f6e47735631..d951f66a4bd 100644 +--- a/icu4c/source/extra/scrptrun/Makefile.in b/icu4c/source/extra/scrptrun/Makefile.in +@@ -12,9 +12,6 @@ + + include $(top_builddir)/icudefs.mk + +-## Platform-specific setup +-
[Libreoffice-commits] core.git: bin/lint-ui.py
bin/lint-ui.py | 30 ++
1 file changed, 18 insertions(+), 12 deletions(-)
New commits:
commit ac6a589e25d014fee3c971ef4588bd64166e6a4b
Author: Noel
AuthorDate: Thu Oct 1 15:15:37 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 1 19:45:36 2020 +0200
improvements to lint-ui script
(*) update to python3
(*) add to list of ignored widgets
(*) add to list of valid top-level widgets
(*) remove border_width check, fires a **lot**
(*) improve some checks so they don't generate python exceptions
(*) make some checks more informative
Change-Id: Ie0b1492eaf752aae8be1ab670bf731015eb454d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103767
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index 91c68bb0af60..7148838c1833 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file is part of the LibreOffice project.
#
@@ -15,8 +15,8 @@ import re
DEFAULT_WARNING_STR = 'Lint assertion failed'
-POSSIBLE_TOP_LEVEL_WIDGETS = ['GtkDialog', 'GtkMessageDialog', 'GtkBox',
'GtkFrame', 'GtkGrid']
-IGNORED_TOP_LEVEL_WIDGETS = ['GtkAdjustment', 'GtkImage', 'GtkListStore',
'GtkSizeGroup', 'GtkMenu', 'GtkTextBuffer']
+POSSIBLE_TOP_LEVEL_WIDGETS = ['GtkDialog', 'GtkMessageDialog', 'GtkBox',
'GtkFrame', 'GtkGrid', 'GtkAssistant']
+IGNORED_TOP_LEVEL_WIDGETS = ['GtkAdjustment', 'GtkImage', 'GtkListStore',
'GtkSizeGroup', 'GtkMenu', 'GtkTextBuffer', 'GtkTreeStore']
BORDER_WIDTH = '6'
BUTTON_BOX_SPACING = '12'
ALIGNMENT_TOP_PADDING = '6'
@@ -34,12 +34,13 @@ def check_top_level_widget(element):
# check widget type
widget_type = element.attrib['class']
lint_assert(widget_type in POSSIBLE_TOP_LEVEL_WIDGETS,
-"Top level widget should be 'GtkDialog', 'GtkFrame', 'GtkBox',
or 'GtkGrid'")
+"Top level widget should be 'GtkDialog', 'GtkFrame', 'GtkBox',
or 'GtkGrid', but is " + widget_type)
# check border_width property
border_width_properties = element.findall("property[@name='border_width']")
-if len(border_width_properties) < 1:
-lint_assert(False, "No border_width set on top level widget. Should
probably be " + BORDER_WIDTH)
+# This one fires so often I don't think it's useful
+#if len(border_width_properties) < 1:
+#lint_assert(False, "No border_width set on top level widget. Should
probably be " + BORDER_WIDTH)
if len(border_width_properties) == 1:
border_width = border_width_properties[0]
if widget_type == "GtkMessageDialog":
@@ -50,13 +51,13 @@ def check_top_level_widget(element):
"Top level 'border_width' property should be " +
BORDER_WIDTH)
def check_button_box_spacing(element):
-spacing = element.findall("property[@name='spacing']")[0]
-lint_assert(spacing.text == BUTTON_BOX_SPACING,
+spacing = element.findall("property[@name='spacing']")
+lint_assert(len(spacing) > 0 and spacing[0].text == BUTTON_BOX_SPACING,
"Button box 'spacing' should be " + BUTTON_BOX_SPACING)
def check_message_box_spacing(element):
-spacing = element.findall("property[@name='spacing']")[0]
-lint_assert(spacing.text == MESSAGE_BOX_SPACING,
+spacing = element.findall("property[@name='spacing']")
+lint_assert(len(spacing) > 0 and spacing[0].text == MESSAGE_BOX_SPACING,
"Button box 'spacing' should be " + MESSAGE_BOX_SPACING)
def check_radio_buttons(root):
@@ -106,7 +107,7 @@ def check_title_labels(root):
words = re.split(r'[^a-zA-Z0-9:_-]', title.text)
first = True
for word in words:
-if word[0].islower() and (word not in IGNORED_WORDS or first):
+if len(word) and word[0].islower() and (word not in IGNORED_WORDS
or first):
lint_assert(False, "The word '" + word + "' should be
capitalized")
first = False
@@ -118,7 +119,12 @@ def main():
lint_assert('domain' in root.attrib, "interface needs to specific
translation domain")
top_level_widgets = [element for element in root.findall('object') if
element.attrib['class'] not in IGNORED_TOP_LEVEL_WIDGETS]
-assert len(top_level_widgets) == 1
+lint_assert( len(top_level_widgets) <= 1, "should be only one top-level
widget for us to analyze, found " + str(len(top_level_widgets)))
+if len(top_level_widgets) > 1:
+return
+# eg. one file contains only a Menu, which we don't check
+if len(top_level_widgets) == 0:
+return
top_level_widget = top_level_widgets[0]
check_top_level_widget(top_level_widget)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source connectivity/source
comphelper/source/misc/documentinfo.cxx |3 -
comphelper/source/misc/instancelocker.cxx |2
connectivity/source/commontools/ParameterSubstitution.cxx |2
connectivity/source/commontools/TSkipDeletedSet.cxx |4 -
connectivity/source/commontools/dbtools.cxx | 30 +++---
connectivity/source/drivers/dbase/DTable.cxx |6 --
connectivity/source/drivers/hsqldb/HDriver.cxx|2
connectivity/source/drivers/jdbc/Reader.cxx |3 -
connectivity/source/drivers/jdbc/ResultSet.cxx|3 -
connectivity/source/drivers/jdbc/tools.cxx|3 -
connectivity/source/drivers/odbc/OResultSet.cxx |4 -
11 files changed, 28 insertions(+), 34 deletions(-)
New commits:
commit 9bac19e37f5a432375d24e8f210bb58de9c31bd8
Author: Noel
AuthorDate: Thu Oct 1 14:02:32 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 1 19:36:39 2020 +0200
loplugin:reducevarscope in comphelper,connectivity
Change-Id: Ia70d4963fb892120cc8f79597b46a8fe67b540a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103762
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/misc/documentinfo.cxx
b/comphelper/source/misc/documentinfo.cxx
index 3b191f956866..044a6d0103fd 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -66,7 +66,6 @@ namespace comphelper {
if ( !_rxDocument.is() )
return sTitle;
-OUString sDocURL;
try
{
// 1. ask the model and the controller for their XTitle::getTitle
@@ -81,7 +80,7 @@ namespace comphelper {
// work around a problem with embedded objects, which sometimes
return
// private:object as URL
-sDocURL = _rxDocument->getURL();
+OUString sDocURL = _rxDocument->getURL();
if ( sDocURL.startsWithIgnoreAsciiCase( "private:" ) )
sDocURL.clear();
diff --git a/comphelper/source/misc/instancelocker.cxx
b/comphelper/source/misc/instancelocker.cxx
index c32747e26514..b942d7ec8329 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -121,7 +121,6 @@ void SAL_CALL OInstanceLocker::initialize( const
uno::Sequence< uno::Any >& aArg
uno::Reference< uno::XInterface > xInstance;
uno::Reference< embed::XActionsApproval > xApproval;
-sal_Int32 nModes = 0;
try
{
@@ -138,6 +137,7 @@ void SAL_CALL OInstanceLocker::initialize( const
uno::Sequence< uno::Any >& aArg
uno::Reference< uno::XInterface >(),
0 );
+sal_Int32 nModes = 0;
if (
!( aArguments[1] >>= nModes ) ||
(
diff --git a/connectivity/source/commontools/ParameterSubstitution.cxx
b/connectivity/source/commontools/ParameterSubstitution.cxx
index 3a58fed70b09..ca96cf331406 100644
--- a/connectivity/source/commontools/ParameterSubstitution.cxx
+++ b/connectivity/source/commontools/ParameterSubstitution.cxx
@@ -66,11 +66,11 @@ namespace connectivity
{
OSQLParser aParser( m_xContext );
OUString sErrorMessage;
-OUString sNewSql;
std::unique_ptr pNode =
aParser.parseTree(sErrorMessage,_sText);
if(pNode)
{ // special handling for parameters
OSQLParseNode::substituteParameterNames(pNode.get());
+OUString sNewSql;
pNode->parseNodeToStr( sNewSql, xConnection );
sRet = sNewSql;
}
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx
b/connectivity/source/commontools/TSkipDeletedSet.cxx
index d3ae392f7a09..701bd743f6c0 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -171,7 +171,7 @@ bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool
_bRetrieveData)
{
// bookmark isn't known yet
// start at the last known position
-sal_Int32 nCurPos = 0,nLastBookmark = 1;
+sal_Int32 nCurPos = 0;
if ( m_aBookmarksPositions.empty() )
{
bDataFound = m_pHelper->move(IResultSetHelper::FIRST, 0,
_bRetrieveData );
@@ -185,7 +185,7 @@ bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool
_bRetrieveData)
} // if ( m_aBookmarksPositions.empty() )
else
{
-nLastBookmark = (*m_aBookmarksPositions.rbegin())/*->first*/;
+sal_Int32 nLastBookmark =
*m_aBookmarksPositions.rbegin()/*->first*/;
nCurPos =
/*(**/m_aBookmarksPositions.size()/*->second*/;
nNewPos = nNewPos - nCurPos;
bDataFound = m_pHelper
[Libreoffice-commits] core.git: sc/qa sw/qa uitest/uitest
sc/qa/uitest/calc_tests/columns.py | 62 +--
sc/qa/uitest/calc_tests/formatCells.py | 17 -
sc/qa/uitest/calc_tests/rows.py | 62 +--
sc/qa/uitest/calc_tests9/tdf126673.py| 17 -
sc/qa/uitest/chart/chartArea.py | 16
sc/qa/uitest/chart/chartGrid.py | 15
sc/qa/uitest/chart/chartWall.py | 16
sc/qa/uitest/chart/chartXAxis.py | 16
sc/qa/uitest/chart/chartYAxis.py | 16
sc/qa/uitest/chart/formatDataSeries.py | 16
sc/qa/uitest/chart/tdf93506_trendline.py | 16
sw/qa/uitest/chapterNumbering/chapterNumbering.py| 15
sw/qa/uitest/table/tableProperties.py| 16
sw/qa/uitest/writer_tests2/formatBulletsNumbering.py | 43 +
sw/qa/uitest/writer_tests2/formatParagraph.py| 29
sw/qa/uitest/writer_tests3/lineNumbering.py | 15
sw/qa/uitest/writer_tests5/columns.py| 17 -
sw/qa/uitest/writer_tests6/tdf128431.py | 17 -
sw/qa/uitest/writer_tests7/tdf132169.py | 15
sw/qa/uitest/writer_tests7/tdf133189.py | 20 --
sw/qa/uitest/writer_tests7/tdf99711.py | 15
uitest/uitest/uihelper/common.py | 25 +++
22 files changed, 78 insertions(+), 418 deletions(-)
New commits:
commit a2d3b5721fc723608cea13a78ce09f959d0b9b9f
Author: Xisco Fauli
AuthorDate: Thu Oct 1 12:40:04 2020 +0200
Commit: Xisco Fauli
CommitDate: Thu Oct 1 18:35:11 2020 +0200
uitest: factor out common duplicated code
Change-Id: Ib6d4edaf3bd1b0a4078c277d1139d7b0db479e2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103757
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/uitest/calc_tests/columns.py
b/sc/qa/uitest/calc_tests/columns.py
index 09d6990686f1..784730ddff5a 100644
--- a/sc/qa/uitest/calc_tests/columns.py
+++ b/sc/qa/uitest/calc_tests/columns.py
@@ -7,6 +7,7 @@
from uitest.framework import UITestCase
from uitest.uihelper.common import get_state_as_dict
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
from uitest.uihelper.calc import enter_text_to_cell
from libreoffice.calc.document import get_cell_by_position
from libreoffice.uno.propertyvalue import mkPropertyValues
@@ -19,21 +20,8 @@ class CalcColumns(UITestCase):
gridwin = xCalcDoc.getChild("grid_window")
document = self.ui_test.get_component()
-#Make sure that tools-options-StarOffice Calc-General
-self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
#optionsdialog
-xDialogOpt = self.xUITest.getTopFocusWindow()
+change_measurement_unit(self, "Centimeter")
-xPages = xDialogOpt.getChild("pages")
-xWriterEntry = xPages.getChild('3') # Calc
-xWriterEntry.executeAction("EXPAND", tuple())
-xWriterGeneralEntry = xWriterEntry.getChild('0')
-xWriterGeneralEntry.executeAction("SELECT", tuple()) #General
/cm
-xunitlb = xDialogOpt.getChild("unitlb")
-props = {"TEXT": "Centimeter"}
-actionProps = mkPropertyValues(props)
-xunitlb.executeAction("SELECT", actionProps)
-xOKBtn = xDialogOpt.getChild("ok")
-self.ui_test.close_dialog_through_button(xOKBtn)
#select A1
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
#column width
@@ -74,21 +62,7 @@ class CalcColumns(UITestCase):
gridwin = xCalcDoc.getChild("grid_window")
document = self.ui_test.get_component()
-#Make sure that tools-options-StarOffice Calc-General
-self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
#optionsdialog
-xDialogOpt = self.xUITest.getTopFocusWindow()
-
-xPages = xDialogOpt.getChild("pages")
-xWriterEntry = xPages.getChild('3') # Calc
-xWriterEntry.executeAction("EXPAND", tuple())
-xWriterGeneralEntry = xWriterEntry.getChild('0')
-xWriterGeneralEntry.executeAction("SELECT", tuple()) #General
/cm
-xunitlb = xDialogOpt.getChild("unitlb")
-props = {"TEXT": "Centimeter"}
-actionProps = mkPropertyValues(props)
-xunitlb.executeAction("SELECT", actionProps)
-xOKBtn = xDialogOpt.getChild("ok")
-self.ui_test.close_dialog_through_button(xOKBtn)
+change_measurement_unit(self, "Centimeter")
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "C1",
"EXTEND":"1"}))
@@ -129,21 +103,8 @@ class CalcColumns(UITestCase):
gridwin = xCalcDoc.
[Libreoffice-commits] core.git: sw/source
sw/source/filter/basflt/iodetect.cxx | 30 --
1 file changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 46abe9243091c72b271f0f316796947527eeb562
Author: Caolán McNamara
AuthorDate: Thu Oct 1 14:43:42 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 1 18:00:47 2020 +0200
crashtesting: ucsdet_detect may return nullptr
"a UCharsetMatch representing the best matching charset, or NULL if no
charset
matches the byte data."
e.g. with fdo39418-4-25.mtp
seen since...
commit ef77a256de527f6d00212839e55f949024f2e7bc
Date: Wed Sep 16 18:11:22 2020 +0900
tdf#60145 sw: fix UTF-8 encoding without BOM is not detected
Writer can now detect Unicode type even if importing text file does not
have a BOM.
Change-Id: I7502f895b49c26dff632510936953e93900e03a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103768
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/basflt/iodetect.cxx
b/sw/source/filter/basflt/iodetect.cxx
index a47bb9e82b8d..04466aa80648 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -275,21 +275,23 @@ bool SwIoSystem::IsDetectableText(const char* pBuf,
sal_uLong &rLen,
UErrorCode uerr = U_ZERO_ERROR;
UCharsetDetector* ucd = ucsdet_open(&uerr);
ucsdet_setText(ucd, pBuf, rLen, &uerr);
-const UCharsetMatch* match = ucsdet_detect(ucd, &uerr);
-const char* pEncodingName = ucsdet_getName(match, &uerr);
-
-if (U_SUCCESS(uerr) && !strcmp("UTF-8", pEncodingName))
-{
-eCharSet = RTL_TEXTENCODING_UTF8; // UTF-8
-}
-else if (U_SUCCESS(uerr) && !strcmp("UTF-16BE", pEncodingName))
+if (const UCharsetMatch* match = ucsdet_detect(ucd, &uerr))
{
-eCharSet = RTL_TEXTENCODING_UCS2; // UTF-16BE
-bLE = false;
-}
-else if (U_SUCCESS(uerr) && !strcmp("UTF-16LE", pEncodingName))
-{
-eCharSet = RTL_TEXTENCODING_UCS2; // UTF-16LE
+const char* pEncodingName = ucsdet_getName(match, &uerr);
+
+if (U_SUCCESS(uerr) && !strcmp("UTF-8", pEncodingName))
+{
+eCharSet = RTL_TEXTENCODING_UTF8; // UTF-8
+}
+else if (U_SUCCESS(uerr) && !strcmp("UTF-16BE", pEncodingName))
+{
+eCharSet = RTL_TEXTENCODING_UCS2; // UTF-16BE
+bLE = false;
+}
+else if (U_SUCCESS(uerr) && !strcmp("UTF-16LE", pEncodingName))
+{
+eCharSet = RTL_TEXTENCODING_UCS2; // UTF-16LE
+}
}
ucsdet_close(ucd);
___
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/05230100.xhp | 70 ++-- source/text/swriter/01/05060100.xhp | 56 +++- 2 files changed, 82 insertions(+), 44 deletions(-) New commits: commit 98b0d33be0320b901924ae3008d3e1e96a1a6a65 Author: Seth Chaiklin AuthorDate: Tue Sep 29 21:42:26 2020 +0200 Commit: Olivier Hallot CommitDate: Thu Oct 1 17:37:39 2020 +0200 tdf#137141 update Position and Size help for Textbox and Shape - add switches because Writer Position and Size tab is different from other modules - add Sections for "Anchor" and "Position" in "Type" help page, so that they can be embedded into "Position and Size" for the Writer-specific controls - add "To Frame" control for Writer - add "Follow text flow" control for Writer - introduce switch for "Related Topics" in "Position and Size" because only current topic is "Writer"-specific, and changed link to a more useful "guide" - update paragraphs to , , , Change-Id: I74cb6e9260f7ea1c5aadececaf0ee00c6eef3fbc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103653 Reviewed-by: Seth Chaiklin Reviewed-by: Olivier Hallot Tested-by: Jenkins diff --git a/source/text/shared/01/05230100.xhp b/source/text/shared/01/05230100.xhp index 994874236..7ab4bb94d 100644 --- a/source/text/shared/01/05230100.xhp +++ b/source/text/shared/01/05230100.xhp @@ -1,6 +1,5 @@ -
[Libreoffice-commits] help.git: source/text
source/text/scalc/00/avail_release.xhp |3 +++
source/text/scalc/01/04060104.xhp |4 ++--
source/text/scalc/01/04060106.xhp |4 ++--
source/text/scalc/01/04060109.xhp |2 ++
source/text/scalc/01/ful_func.xhp |3 +++
source/text/scalc/01/func_now.xhp |1 +
source/text/scalc/01/func_today.xhp|1 +
7 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit d818260b9a4f4546cd5b5a5dbd825bb4ad0ed679
Author: Olivier Hallot
AuthorDate: Tue Sep 29 15:00:00 2020 -0300
Commit: Olivier Hallot
CommitDate: Thu Oct 1 17:38:04 2020 +0200
Inform user on volatile functions
Change-Id: I31f05cc446ecab2bba698660d31790652298578b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103634
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/scalc/00/avail_release.xhp
b/source/text/scalc/00/avail_release.xhp
index 52e5e790c..13cace8af 100644
--- a/source/text/scalc/00/avail_release.xhp
+++ b/source/text/scalc/00/avail_release.xhp
@@ -77,5 +77,8 @@
This function is available since
%PRODUCTNAME 7.0.
+
+This function is available since
%PRODUCTNAME 7.1.
+
diff --git a/source/text/scalc/01/04060104.xhp
b/source/text/scalc/01/04060104.xhp
index f79ff3163..c6bf427ff 100644
--- a/source/text/scalc/01/04060104.xhp
+++ b/source/text/scalc/01/04060104.xhp
@@ -154,7 +154,7 @@
INFO
Returns
specific information about the current working environment. The function
receives a single text argument and returns data depending on that
parameter.
-
+
INFO("Type")
The following
table lists the values for the text parameter Type
and the return values of the INFO function.
@@ -250,7 +250,7 @@
FORMULA
Displays the formula of a formula cell as a text
string.
-
+
FORMULA(Reference)
Reference is a reference to a cell containing a
formula.
diff --git a/source/text/scalc/01/04060106.xhp
b/source/text/scalc/01/04060106.xhp
index ee630c619..a1318fe48 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -1512,7 +1512,7 @@
RANDBETWEEN
Returns an integer random number in a specified
range.
-
+
RANDBETWEEN(Bottom;
Top)
Returns an
integer random number between integers Bottom and Top
(both inclusive).
@@ -1548,7 +1548,7 @@
RAND
Returns a random number between 0 and
1.The value of 0 can be returned, the value of 1
not.this is really true after issue 53642 will be
fixed
-
+
RAND()
This function
produces a new random number each time Calc recalculates. To force Calc to
recalculate manually press F9.
diff --git a/source/text/scalc/01/04060109.xhp
b/source/text/scalc/01/04060109.xhp
index ef5006005..cd7809cd7 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -209,6 +209,7 @@
INDIRECT
Returns the
reference specified by a text string. This function can
also be used to return the area of a corresponding string.
+
INDIRECT(Ref [; A1])
@@ -350,6 +351,7 @@
OFFSET
Returns the value of a cell
offset by a certain number of rows and columns from a given reference
point.
+
OFFSET(Reference; Rows; Columns [; Height [; Width]])
diff --git a/source/text/scalc/01/ful_func.xhp
b/source/text/scalc/01/ful_func.xhp
index d53e5fd81..812471972 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -74,5 +74,8 @@
Reference
1, Reference 2, … ,Reference 255 are references to cells.
+
+This function
is always recalculated whenever a recalculation occurs.
+
diff --git a/source/text/scalc/01/func_now.xhp
b/source/text/scalc/01/func_now.xhp
index fbb84d2ed..45227d288 100644
--- a/source/text/scalc/01/func_now.xhp
+++ b/source/text/scalc/01/func_now.xhp
@@ -29,6 +29,7 @@
NOW
Returns the computer system date and time. The
value is updated when you recalculate the document or each time a cell value is
modified.
+
NOW()
diff --git a/source/text/scalc/01/func_today.xhp
b/source/text/scalc/01/func_today.xhp
index ac5fee6e8..e4214238d 100644
--- a/source/text/scalc/01/func_today.xhp
+++ b/source/text/scalc/01/func_today.xhp
@@ -29,6 +29,7 @@
TODAY
Returns the current computer system date. The
value is updated when you reopen the document or modify the values of the
document.
+
TODAY()
___
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/0605.xhp | 16 1 file changed, 12 insertions(+), 4 deletions(-) New commits: commit 9166d7a0866c6187376b8f72e2b858fe161b8938 Author: Seth Chaiklin AuthorDate: Thu Oct 1 16:23:52 2020 +0200 Commit: Seth Chaiklin CommitDate: Thu Oct 1 17:21:54 2020 +0200 move links to related topics in Bullets and Numbering help page - moved two links (from 15 years ago) from the top of the page into the "related topics" section - took "Reset" control out of Writer-only switch - added "Related topics" section for Draw and Impress, including the relevant embedded link Change-Id: I3a38668f125f2d142601d47c767f89c7d7cf2329 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103664 Reviewed-by: Seth Chaiklin Tested-by: Jenkins diff --git a/source/text/shared/01/0605.xhp b/source/text/shared/01/0605.xhp index 48ba0a1a3..935d95ee8 100644 --- a/source/text/shared/01/0605.xhp +++ b/source/text/shared/01/0605.xhp @@ -1,6 +1,5 @@ -
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bmpfast.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a0cefd04fc2abaadea9b066596f22372179beeea
Author: Luboš Luňák
AuthorDate: Thu Oct 1 15:10:01 2020 +0200
Commit: Luboš Luňák
CommitDate: Thu Oct 1 17:14:12 2020 +0200
fix incorrect warning
I find it mildly amusing that the whole functions handles
ScanlineFormat::TopDown except in its initial check.
Change-Id: I4e3d818e9b27f3421b0db3d39b71ffcddefe52ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103766
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index cbf72d809490..9ee00b7bdd40 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -462,7 +462,8 @@ static bool ImplBlendToBitmap( TrueColorPixelPtr&
rSrcLine,
BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer,
const BitmapBuffer& rMskBuffer )
{
-SAL_WARN_IF( rMskBuffer.mnFormat != ScanlineFormat::N8BitPal, "vcl.gdi",
"FastBmp BlendImage: unusual MSKFMT" );
+SAL_WARN_IF(( rMskBuffer.mnFormat & ~ScanlineFormat::TopDown ) !=
ScanlineFormat::N8BitPal,
+"vcl.gdi", "FastBmp BlendImage: unusual MSKFMT" );
const int nSrcLinestep = rSrcBuffer.mnScanlineSize;
int nMskLinestep = rMskBuffer.mnScanlineSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx |1
vcl/unx/gtk3/gtk3gtkframe.cxx | 74 +++---
2 files changed, 42 insertions(+), 33 deletions(-)
New commits:
commit 5f0492debf068c62604b936e68191257656ecbde
Author: Caolán McNamara
AuthorDate: Thu Oct 1 12:30:51 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 1 16:46:59 2020 +0200
Related: tdf#134566 split signalIMPreeditChanged to extract a reusable piece
Change-Id: Iff979921629a0e1c8d2b3fbd51a9f2f7270a3d53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103763
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 14142223523b..ce0858d7b742 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -527,6 +527,7 @@ public:
static SalWheelMouseEvent GetWheelEvent(GdkEventScroll& rEvent);
static gboolean NativeWidgetHelpPressed(GtkAccelGroup*,
GObject*, guint,
GdkModifierType, gpointer pFrame);
+static OUString GetPreeditDetails(GtkIMContext* pIMContext,
std::vector& rInputFlags, sal_Int32& rCursorPos, sal_uInt8&
rCursorFlags);
void DisallowCycleFocusOut();
};
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 8d030931e993..40558262977c 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4138,45 +4138,27 @@ void GtkSalFrame::IMHandler::signalIMCommit(
GtkIMContext* /*pContext*/, gchar*
}
}
-void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer
im_handler )
+OUString GtkSalFrame::GetPreeditDetails(GtkIMContext* pIMContext,
std::vector& rInputFlags, sal_Int32& rCursorPos, sal_uInt8&
rCursorFlags)
{
-GtkSalFrame::IMHandler* pThis =
static_cast(im_handler);
-
char* pText = nullptr;
PangoAttrList* pAttrs = nullptr;
gintnCursorPos = 0;
-gtk_im_context_get_preedit_string( pThis->m_pIMContext,
+gtk_im_context_get_preedit_string( pIMContext,
&pText,
&pAttrs,
&nCursorPos );
-if( pText && ! *pText ) // empty string
-{
-// change from nothing to nothing -> do not start preedit
-// e.g. this will activate input into a calc cell without
-// user input
-if( pThis->m_aInputEvent.maText.getLength() == 0 )
-{
-g_free( pText );
-pango_attr_list_unref( pAttrs );
-return;
-}
-}
-
-pThis->m_bPreeditJustChanged = true;
-bool bEndPreedit = (!pText || !*pText) && pThis->m_aInputEvent.mpTextAttr
!= nullptr;
gint nUtf8Len = pText ? strlen(pText) : 0;
-pThis->m_aInputEvent.maText = pText ? OUString(pText,
nUtf8Len, RTL_TEXTENCODING_UTF8) : OUString();
-const OUString& rText = pThis->m_aInputEvent.maText;
+OUString sText = pText ? OUString(pText, nUtf8Len, RTL_TEXTENCODING_UTF8)
: OUString();
std::vector aUtf16Offsets;
-for (sal_Int32 nUtf16Offset = 0; nUtf16Offset < rText.getLength();
rText.iterateCodePoints(&nUtf16Offset))
+for (sal_Int32 nUtf16Offset = 0; nUtf16Offset < sText.getLength();
sText.iterateCodePoints(&nUtf16Offset))
aUtf16Offsets.push_back(nUtf16Offset);
sal_Int32 nUtf32Len = aUtf16Offsets.size();
// from the above loop filling aUtf16Offsets, we know that its size()
fits into sal_Int32
-aUtf16Offsets.push_back(rText.getLength());
+aUtf16Offsets.push_back(sText.getLength());
// sanitize the CurPos which is in utf-32
if (nCursorPos < 0)
@@ -4184,10 +4166,10 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged(
GtkIMContext*, gpointer im_
else if (nCursorPos > nUtf32Len)
nCursorPos = nUtf32Len;
-pThis->m_aInputEvent.mnCursorPos = aUtf16Offsets[nCursorPos];
-pThis->m_aInputEvent.mnCursorFlags = 0;
+rCursorPos = aUtf16Offsets[nCursorPos];
+rCursorFlags = 0;
-pThis->m_aInputFlags = std::vector( std::max( 1,
static_cast(rText.getLength()) ), ExtTextInputAttr::NONE );
+rInputFlags.resize(std::max(1, static_cast(sText.getLength())),
ExtTextInputAttr::NONE);
PangoAttrIterator *iter = pango_attr_list_get_iterator(pAttrs);
do
@@ -4230,7 +4212,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged(
GtkIMContext*, gpointer im_
{
case PANGO_ATTR_BACKGROUND:
sal_attr |= ExtTextInputAttr::Highlight;
-pThis->m_aInputEvent.mnCursorFlags |=
EXTTEXTINPUT_CURSOR_INVISIBLE;
+rCursorFlags |= EXTTEXTINPUT_CURSOR_INVISIBLE;
break;
case PANGO_ATTR_UNDERLINE:
sal_attr |= ExtTextInputAttr::Underline;
@@ -4252,22 +4234,48 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged(
Gt
[Libreoffice-commits] core.git: basctl/source basic/qa basic/source
basctl/source/basicide/localizationmgr.cxx |6 ++
basic/qa/cppunit/basictest.cxx |2 +-
basic/source/classes/image.cxx | 10 +-
basic/source/runtime/methods.cxx |3 +--
basic/source/runtime/runtime.cxx |7 +++
basic/source/uno/scriptcont.cxx|2 +-
6 files changed, 13 insertions(+), 17 deletions(-)
New commits:
commit 38786f1df9ed8324a44c9f2afacb245744b54ebc
Author: Noel
AuthorDate: Thu Oct 1 14:01:16 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 1 16:12:20 2020 +0200
loplugin:reducevarscope in basctl,basic
Change-Id: I32595921bf5ed26699bced3637302692c407d624
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103760
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basctl/source/basicide/localizationmgr.cxx
b/basctl/source/basicide/localizationmgr.cxx
index 3a57c8de672d..45c6239bc5c7 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -302,10 +302,9 @@ sal_Int32
LocalizationMgr::implHandleControlResourceProperties
for( sal_Int32 i = 0 ; i < nLocaleCount ; i++ )
{
const Locale& rLocale = pLocales[ i ];
-OUString aResStr;
try
{
-aResStr =
xStringResourceManager->resolveStringForLocale
+OUString aResStr =
xStringResourceManager->resolveStringForLocale
( aPureSourceIdStr, rLocale );
xStringResourceManager->removeIdForLocale(
aPureSourceIdStr, rLocale );
xStringResourceManager->setStringForLocale(
aPureIdStr, aResStr, rLocale );
@@ -515,10 +514,9 @@ sal_Int32
LocalizationMgr::implHandleControlResourceProperties
{
const Locale& rLocale = pLocales[ iLocale ];
-OUString aResStr;
try
{
-aResStr =
xStringResourceManager->resolveStringForLocale
+OUString aResStr =
xStringResourceManager->resolveStringForLocale
( aPureSourceIdStr, rLocale );
xStringResourceManager->removeIdForLocale(
aPureSourceIdStr, rLocale );
xStringResourceManager->setStringForLocale( aPureIdStr, aResStr, rLocale );
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index 4122885ba10c..f1e169ab8acc 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -48,11 +48,11 @@ void MacroSnippet::LoadSourceFromFile( const OUString&
sMacroFileURL )
if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
{
sal_uInt64 size;
-sal_uInt64 size_read;
if(aFile.getSize(size) == osl::FileBase::E_None)
{
void* buffer = calloc(1, size+1);
CPPUNIT_ASSERT(buffer);
+sal_uInt64 size_read;
if(aFile.read( buffer, size, size_read) == osl::FileBase::E_None)
{
if(size == size_read)
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index eb127e755f1f..6ce3b8894ca9 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -117,15 +117,15 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
// Read Master-Record
r.ReadUInt16( nSign ).ReadUInt32( nLen ).ReadUInt16( nCount );
sal_uInt64 nLast = r.Tell() + nLen;
-sal_uInt32 nCharSet; // System charset
-sal_uInt32 lDimBase;
-sal_uInt16 nReserved1;
-sal_uInt32 nReserved2;
-sal_uInt32 nReserved3;
bool bBadVer = false;
if( nSign == static_cast( FileOffset::Module ) )
{
+sal_uInt32 nCharSet; // System charset
+sal_uInt32 lDimBase;
sal_uInt16 nTmpFlags;
+sal_uInt16 nReserved1;
+sal_uInt32 nReserved2;
+sal_uInt32 nReserved3;
r.ReadUInt32( nVersion ).ReadUInt32( nCharSet ).ReadUInt32( lDimBase )
.ReadUInt16( nTmpFlags ).ReadUInt16( nReserved1 ).ReadUInt32(
nReserved2 ).ReadUInt32( nReserved3 );
nFlags = static_cast(nTmpFlags);
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 78dcbf5097d6..3e8f8d23cd42 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4107,8 +4107,6 @@ void SbRtl_StrConv(StarBASIC *, SbxArray & rPar, bool)
OUString aOldStr = rPar.Get32(1)->GetOUString();
sal_Int32 nConversion = rPar.Get32(2)->GetLong();
-LanguageType nLanguage = LANGUAGE_SYSTEM;
-
sal
A "normal" client interface.
Hi, is there a "normal" client when connecting to a libreoffice server. (I assume that libreoffice can work as a server). I know there are several webclients like nextcloud and owncloud. Is it for example possible to use the normal libreoffice program and connect to a server to open and edit a document? Stef Bon ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - 8 commits - download.lst external/nss xmlsecurity/source
Rebased ref, commits from common ancestor: commit 7fc932945585f11dc766d0d8610f286b39fce2d2 Author: Michael Stahl AuthorDate: Fri Aug 7 18:57:00 2020 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu Oct 1 15:35:32 2020 +0200 nss: upgrade to release 3.55.0 Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403. (also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47) * external/nss/nss.nspr-parallel-win-debug_build.patch: remove, merged upstream Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420 Reviewed-by: Xisco Fauli (cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590 Reviewed-by: Caolán McNamara (cherry picked from commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f) Conflicts: download.lst external/nss/UnpackedTarball_nss.mk Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888 diff --git a/download.lst b/download.lst index f268b74c5722..82a49260fb41 100644 --- a/download.lst +++ b/download.lst @@ -34,8 +34,8 @@ LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 -NSS_MD5SUM := 22fa83bfedda5fde047a714d8a4d8968 -export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz +NSS_MD5SUM := d18bfd181e345cd07c0213d62bdf9ad7 +export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021 export PYTHON_TARBALL := Python-3.3.5.tgz OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114 diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index db6bdd4640c8..cf7ad65803a1 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \ external/nss/nss-winXP-sdk.patch.1) \ $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss-no-c99.patch) \ - external/nss/nss.nspr-parallel-win-debug_build.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch b/external/nss/nss.nspr-parallel-win-debug_build.patch deleted file mode 100644 index 86b55e1ccf7f.. --- a/external/nss/nss.nspr-parallel-win-debug_build.patch +++ /dev/null @@ -1,40 +0,0 @@ -Änderung:4866:23940b78e965 -Nutzer: Jan-Marek Glogowski -Datum: Fri May 01 22:50:55 2020 + -Dateien: pr/tests/Makefile.in -Beschreibung: -Bug 290526 Write separate PDBs for test OBJs r=glandium - -Quite often when running a parallel NSS build, I get the following -compiler error message, resulting in a build failure, despite -compiling with the -FS flag: - -.../nss/nspr/pr/tests/zerolen.c: fatal error C1041: -Programmdatenbank "...\nss\nspr\out\pr\tests\vc140.pdb" kann nicht -ge<94>ffnet werden; verwenden Sie /FS, wenn mehrere CL.EXE in -dieselbe .PDB-Datei schreiben. - -The failing source file is always one of the last test object -files. But the actual problem is not the compiler accessing the -PDB file, but the linker already linking the first test -executables accessing the shared PDB; at least that's my guess. - -So instead of using a shared PDB for all test object files, this -uses -Fd$(@:.$(OBJ_SUFFIX)=.pdb) to write a separate PDB for every -test's object file. The linker works fine with the shared OBJ PDB. - -Differential Revision: https://phabricator.services.mozilla.com/D68693 - - -diff -r 219d131499d5 -r 23940b78e965 nss/nspr/pr/tests/Makefile.in a/nss/nspr/pr/tests/Makefile.inMon Feb 10 20:58:42 2020 + -+++ b/nss/nspr/pr/tests/Makefile.inFri May 01 22:50:55 2020 + -@@ -211,6 +211,7 @@ - else - EXTRA_LIBS += ws2_32.lib - LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO -+ CFLAGS += -Fd$(@:.$(OBJ_SUFFIX)=.pdb) - ifdef PROFILE - LDOPTS += -PROFILE -MAP - endif # profile - commit 85a59a30359cd454830b3403f8dcdc01584f3e13 Author: Jan-Marek Glogowski AuthorDate: Wed Jun 26 18:09:19 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu Oct 1 15:32:17 2020 +0200 NSS: enable parallel build Since NSS 3.53, the Makefile based build should be fixed (upstream bug 290526). The only missing patch is a minimal NSPR fix for the "NSPR, configure + make, parallel, Windows, MS VS, debug" build. That patch isn't incuded in the NSPR 4.25 release (but it's already in the mercurial repo for NSPR 4.26). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95218 Tested-by: Jenkins Reviewed-by:
[Libreoffice-commits] core.git: canvas/source chart2/source
canvas/source/vcl/spritehelper.cxx |2 +-
chart2/source/controller/dialogs/DataBrowser.cxx|2 +-
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |4 ++--
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx |6
++
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |4 ++--
chart2/source/controller/sidebar/ChartAreaPanel.cxx |3 +--
chart2/source/view/charttypes/CandleStickChart.cxx |3 +--
chart2/source/view/main/ChartView.cxx |2 +-
chart2/source/view/main/VDataSeries.cxx |4 ++--
chart2/source/view/main/VLegend.cxx |2 +-
10 files changed, 14 insertions(+), 18 deletions(-)
New commits:
commit 18d4e89fdd63479e20d096c3a578153aa4328aee
Author: Noel
AuthorDate: Thu Oct 1 14:02:05 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 1 15:00:52 2020 +0200
loplugin:reducevarscope in canvas,chart2
Change-Id: I6c73e609cc8ce0ed9cf0f5a6b68c6e299bf26a44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103761
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/canvas/source/vcl/spritehelper.cxx
b/canvas/source/vcl/spritehelper.cxx
index e52bb211020c..14be26c2aa6c 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -101,7 +101,6 @@ namespace vclcanvas
if( !isActive() || ::basegfx::fTools::equalZero( fAlpha ) )
return;
-const Point aEmptyPoint;
const ::basegfx::B2DVector& rOrigOutputSize( getSizePixel() );
// might get changed below (e.g. adapted for
@@ -128,6 +127,7 @@ namespace vclcanvas
if( bNeedBitmapUpdate )
{
+const Point aEmptyPoint;
BitmapEx aBmp( mpBackBuffer->getOutDev().GetBitmapEx( aEmptyPoint,
aOutputSize ) );
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 6f7ada12cbec..89036649c500 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -699,12 +699,12 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16
nColumnId ) const
if( m_apDataBrowserModel->getCellType( nColIndex ) ==
DataBrowserModel::NUMBER )
{
double fData( m_apDataBrowserModel->getCellNumber( nColIndex, nRow
));
-Color nLabelColor;
if( ! std::isnan( fData ) &&
m_spNumberFormatterWrapper )
{
bool bColorChanged = false;
+Color nLabelColor;
aResult = m_spNumberFormatterWrapper->getFormattedString(
GetNumberFormatKey( nColumnId ),
fData, nLabelColor, bColorChanged );
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 302c56280fa0..9703f9dd398d 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -368,9 +368,9 @@ bool DataPointItemConverter::ApplySpecialItem(
case SCHATTR_DATADESCR_SEPARATOR:
{
OUString aNewValue = static_cast< const SfxStringItem & >(
rItemSet.Get( nWhichId )).GetValue();
-OUString aOldValue;
try
{
+OUString aOldValue;
GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>=
aOldValue;
if( m_bOverwriteLabelsForAttributedDataPointsAlso )
{
@@ -689,9 +689,9 @@ void DataPointItemConverter::FillSpecialItem(
case SCHATTR_DATADESCR_SEPARATOR:
{
-OUString aValue;
try
{
+OUString aValue;
GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>=
aValue;
rOutItemSet.Put( SfxStringItem( nWhichId, aValue ));
}
diff --git
a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index b4c4405ff88b..c0691daf24cf 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -107,11 +107,10 @@ uno::Reference< beans::XPropertySet >
lcl_getEquationProperties(
// ensure that a trendline is on
if( pItemSet )
{
-SvxChartRegress eRegress = SvxChartRegress::NONE;
const SfxPoolItem *pPoolItem = nullptr;
if( pItemSet->GetItemState( SCHATTR_REGRESSION_TYPE, true, &pPoolItem
) == SfxItemStat
Re: llvm/clang static analyzer reports
Hi, On Thu, Oct 1, 2020 at 8:59 AM Stephan Bergmann wrote: We would need some mechanism to filter > out such identified false positives, with whatever mechanism would be > suitable: an annotation in the source code, a modification of the > -analyzer-... command line options passed to clang, etc. However, that > filtering should be done in an auditable way, so that we can later > discover that we are filtering false positives relating to a certain > location in the code, and can learn the rationale why those were > considered false positives. (Something that can be a pain with the way > we use Coverity Scan, see below.) > I briefly looked at the documentation [1] and faq [2], and to me it looks like although you can do some things to ignore / filter out specific issues, I cannot tell if this is what you are looking for. Perhaps it's best if I leave that up to people who actually know what they're talking about :). With the analyzer commandline options, it looks like you can disable entire classes of checks with the '-disable-checker' option, but that would mean that the check is disabled for the entire codebase, which probably isn't what you are looking for. [1] https://clang-analyzer.llvm.org/annotations.html [2] https://clang-analyzer.llvm.org/faq.html > From a quick look at the list, I see instances of all of: clearly true > positives, clearly false positives, and unclear findings. > So, does that mean that it might be a useful tool, or are there simply too many false positives to be of any help ? - Maarten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/UnpackedTarball_coinmp.mk |1
external/coinmp/configure-exit.patch | 33 ++
2 files changed, 34 insertions(+)
New commits:
commit 762aacc4e055fffbc605be81f66f2274dccb4be8
Author: Stephan Bergmann
AuthorDate: Thu Oct 1 11:50:40 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Oct 1 14:11:11 2020 +0200
exteranl/coinmp: Fix build with recent GCC 11 trunk
It had started to fail for me now with
> ~/gcc/trunk/inst/bin/g++ -DHAVE_CONFIG_H -I. -I. -O -MT CoinFinite.lo
-MD -MP -MF .deps/CoinFinite.Tpo -c CoinFinite.cpp -fPIC -DPIC -o
.libs/CoinFinite.o
> CoinFinite.cpp: In function 'bool CoinFinite(double)':
> CoinFinite.cpp:38:19: error: 'DBL_MAX' was not declared in this scope
>38 | return val != DBL_MAX && val != -DBL_MAX;
> | ^~~
> CoinFinite.cpp:8:1: note: 'DBL_MAX' is defined in header ''; did
you forget to '#include '?
> 7 | #include "CoinUtilsConfig.h"
> +++ |+#include
> 8 |
because of a missing -DCOINUTILS_BUILD. Which in turn was caused by
workdir/UnpackedTarball/coinmp/CoinUtils/configure (see
workdir/UnpackedTarball/coinmp/CoinUtils/config.log), which first tries to
determine an ac_declaration that would apparently be a suitable declaration
of
`exit` without actually including in a C++ file. It settles on
> configure:3551: ~/gcc/trunk/inst/bin/g++ -c -g -O2 conftest.cc >&5
> conftest.cc:15:17: warning: 'void std::exit(int)' has not been declared
within 'std'
>15 | extern "C" void std::exit (int) throw (); using std::exit;
> | ^~~
> : note: only here as a 'friend'
> configure:3557: $? = 0
(which generates a warning, but no error with the given g++ invocation).
The
determined ac_declaration value is then included in confdefs.h, causing the
later
> configure:4014: ~/gcc/trunk/inst/bin/g++ -o conftest -O3 -pipe -DNDEBUG
-pedantic-errors -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith
-Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long
-DCOINUTILS_BUILD -Wl,-z,origin -Wl,-rpath,\$$ORIGIN conftest.cc >&5
> conftest.cc:15:17: error: 'void std::exit(int)' has not been declared
within 'std'
>15 | extern "C" void std::exit (int) throw (); using std::exit;
> | ^~~
> : note: only here as a 'friend'
> configure:4020: $? = 1
> configure: failed program was:
> | /* confdefs.h. */
> |
> | #define PACKAGE_NAME "CoinUtils"
> | #define PACKAGE_TARNAME "coinutils"
> | #define PACKAGE_VERSION "2.9.11"
> | #define PACKAGE_STRING "CoinUtils 2.9.11"
> | #define PACKAGE_BUGREPORT "http://projects.coin-or.org/CoinUtils";
> | #define COINUTILS_VERSION "2.9.11"
> | #define COINUTILS_VERSION_MAJOR 2
> | #define COINUTILS_VERSION_MINOR 9
> | #define COINUTILS_VERSION_RELEASE 11
> | #define COIN_COINUTILS_VERBOSITY 0
> | #define COIN_COINUTILS_CHECKLEVEL 0
> | #ifdef __cplusplus
> | extern "C" void std::exit (int) throw (); using std::exit;
> | #endif
> | /* end confdefs.h. */
> |
> | int
> | main ()
> | {
> | int i=0; i++;
> | ;
> | return 0;
> | }
> configure:4045: WARNING: The flags CXXFLAGS="-O3 -pipe -DNDEBUG
-pedantic-errors -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith
-Wwrite-strings -Wconversion -Wno-unknown-pragmas -Wno-long-long
-DCOINUTILS_BUILD" do not work. I will now just try '-O', but you might want
to set CXXFLAGS manually.
to fail, because its g++ invocation including -pedantic-errors turns that
> 'void std::exit(int)' has not been declared within 'std'
warning into an error.
There were similar build failures in the Cgl,
> ~/gcc/trunk/inst/bin/g++ -DHAVE_CONFIG_H -I. -I.
-I~/lo/core/workdir/UnpackedTarball/coinmp/CoinUtils/src -DCOIN_HAS_CLP -O -MT
ClpCholeskyDense.lo -MD -MP -MF .deps/ClpCholeskyDense.Tpo -c
ClpCholeskyDense.cpp -fPIC -DPIC -o .libs/ClpCholeskyDense.o
> In file included from ClpCholeskyDense.cpp:11:
> ClpHelperFunctions.hpp:16:4: error: #error "don't have header file for
math"
>16 | # error "don't have header file for math"
> |^
> In file included from ClpCholeskyDense.cpp:11:
> ClpHelperFunctions.hpp: In function 'double CoinSqrt(double)':
> ClpHelperFunctions.hpp:81:13: error: 'sqrt' was not declared in this scope
>81 | return sqrt(x);
> | ^~~~
and Clp,
> ~/gcc/trunk/inst/bin/g++ -DHAVE_CONFIG_H -I. -I. -I.. -I./..
-I./../CglGomory -I~/lo/core/workdir/UnpackedTarball/coinmp/CoinUtils/src
-I~/lo/core/workdir/UnpackedTarball/coinmp/Osi/src/Osi
-I~/lo/core/workdir/UnpackedTarball/coinmp/CoinUtils/src
-I~/lo/core/workdir/UnpackedTarball/coinmp/Clp
[Libreoffice-commits] core.git: .gitmodules
.gitmodules |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit cb5e3b360d9dd8a747002253c989f741cebdbd20 Author: Christian Lohmaier AuthorDate: Thu Oct 1 13:41:04 2020 +0200 Commit: Christian Lohmaier CommitDate: Thu Oct 1 13:41:04 2020 +0200 use https://git.libreoffice.org/$repo as canonical URL for submodules see also https://git.libreoffice.org/lode/+/1b3b18 Change-Id: Iec4eeb7f3b96d343556594a5c04ba750cefa7b58 diff --git a/.gitmodules b/.gitmodules index fe2fb7a8117d..61ecfe58b1f0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "dictionaries"] path = dictionaries - url = https://gerrit.libreoffice.org/dictionaries + url = https://git.libreoffice.org/dictionaries branch = . [submodule "helpcontent2"] path = helpcontent2 - url = https://gerrit.libreoffice.org/help + url = https://git.libreoffice.org/help branch = . [submodule "translations"] path = translations - url = https://gerrit.libreoffice.org/translations + url = https://git.libreoffice.org/translations branch = . ___ 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' - .gitmodules
.gitmodules |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 1fafd6c71820cddc5d9dbcf1e8a8a9a911a64963 Author: Christian Lohmaier AuthorDate: Thu Oct 1 13:41:04 2020 +0200 Commit: Christian Lohmaier CommitDate: Thu Oct 1 13:43:06 2020 +0200 use https://git.libreoffice.org/$repo as canonical URL for submodules see also https://git.libreoffice.org/lode/+/1b3b18 Change-Id: Iec4eeb7f3b96d343556594a5c04ba750cefa7b58 (cherry picked from commit cb5e3b360d9dd8a747002253c989f741cebdbd20) diff --git a/.gitmodules b/.gitmodules index fe2fb7a8117d..61ecfe58b1f0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "dictionaries"] path = dictionaries - url = https://gerrit.libreoffice.org/dictionaries + url = https://git.libreoffice.org/dictionaries branch = . [submodule "helpcontent2"] path = helpcontent2 - url = https://gerrit.libreoffice.org/help + url = https://git.libreoffice.org/help branch = . [submodule "translations"] path = translations - url = https://gerrit.libreoffice.org/translations + url = https://git.libreoffice.org/translations branch = . ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit2.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit adb00eee518b5c5b743201cb554880448b1f29a9
Author: Caolán McNamara
AuthorDate: Thu Oct 1 10:40:01 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 1 13:30:16 2020 +0200
Related: tdf#134566 tell IM cursor pos for empty paragraph too
even if there is no text yet we should update the IM cursor
position if asked for it
Change-Id: I9c3b9eef9f58180b00a8276d25fad83400a92043
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103751
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 34babbcedc7f..0887005cc8b1 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -460,7 +460,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt,
EditView* pView )
}
else if ( rCEvt.GetCommand() == CommandEventId::CursorPos )
{
-if ( mpIMEInfos && mpIMEInfos->nLen )
+if (mpIMEInfos)
{
EditPaM aPaM( pView->pImpEditView->GetEditSelection().Max() );
tools::Rectangle aR1 = PaMtoEditCursor( aPaM );
@@ -529,7 +529,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt,
EditView* pView )
}
else if ( rCEvt.GetCommand() == CommandEventId::QueryCharPosition )
{
-if ( mpIMEInfos && mpIMEInfos->nLen )
+if (mpIMEInfos)
{
EditPaM aPaM( pView->pImpEditView->GetEditSelection().Max() );
if ( !IsFormatted() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/PropertyMaps.cxx |3 +--
xmloff/source/chart/SchXMLExport.cxx |7 +++
xmloff/source/chart/SchXMLPlotAreaContext.cxx|3 +--
xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx |2 +-
xmloff/source/draw/SignatureLineContext.cxx |2 +-
xmloff/source/draw/animexp.cxx |3 +--
xmloff/source/draw/sdpropls.cxx |2 +-
xmloff/source/draw/sdxmlexp.cxx |3 +--
xmloff/source/draw/shapeexport.cxx |2 +-
xmloff/source/forms/controlpropertyhdl.cxx |2 +-
xmloff/source/style/DrawAspectHdl.cxx|5 +
xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx |3 +--
xmloff/source/style/XMLConstantsPropertyHandler.cxx |3 +--
xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx |3 +--
xmloff/source/style/cdouthdl.cxx |6 +++---
xmloff/source/style/chrhghdl.cxx |3 +--
xmloff/source/style/csmaphdl.cxx |2 +-
xmloff/source/style/fonthdl.cxx |6 ++
xmloff/source/style/shadwhdl.cxx |3 +--
xmloff/source/style/styleexp.cxx |2 +-
xmloff/source/style/undlihdl.cxx |6 +++---
xmloff/source/style/xmlbahdl.cxx | 10 +-
xmloff/source/style/xmlimppr.cxx |3 +--
xmloff/source/style/xmlnumfe.cxx |2 +-
xmloff/source/style/xmlstyle.cxx |3 +--
xmloff/source/text/XMLSectionFootnoteConfigExport.cxx|2 +-
xmloff/source/text/XMLTextHeaderFooterContext.cxx|2 +-
xmloff/source/text/txtdrope.cxx |4 ++--
xmloff/source/text/txtflde.cxx |2 +-
xmloff/source/text/txtparae.cxx |2 +-
xmloff/source/text/txtstyle.cxx |2 +-
31 files changed, 43 insertions(+), 60 deletions(-)
New commits:
commit 7bd7ff5a8d938e474a8f15e2c6facad632a342bb
Author: Noel
AuthorDate: Thu Oct 1 11:00:51 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 1 12:23:08 2020 +0200
loplugin:reducevarscope in xmloff
Change-Id: Ib67311f84a6a7a490afb392e642d74693fde3113
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103747
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/chart/PropertyMaps.cxx
b/xmloff/source/chart/PropertyMaps.cxx
index 1b00ac9227cf..6ce23fb54c68 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -403,7 +403,6 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
OUString sAttrName = getPropertySetMapper()->GetEntryXMLName(
rProperty.mnIndex );
sal_uInt16 nNameSpace = getPropertySetMapper()->GetEntryNameSpace(
rProperty.mnIndex );
OUStringBuffer sValueBuffer;
-OUString sValue;
sal_Int32 nValue = 0;
bool bValue = false;
@@ -519,7 +518,7 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
if( !sValueBuffer.isEmpty())
{
-sValue = sValueBuffer.makeStringAndClear();
+OUString sValue = sValueBuffer.makeStringAndClear();
sAttrName = rNamespaceMap.GetQNameByKey( nNameSpace, sAttrName );
rAttrList.AddAttribute( sAttrName, sValue );
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index 4911d5180d03..07a1019ccc71 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2659,7 +2659,6 @@ void SchXMLExportHelper_Impl::exportSeries(
xSource->getDataSequences());
sal_Int32 nMainSequenceIndex = -1;
sal_Int32 nSeriesLength = 0;
-sal_Int32 nAttachedAxis =
chart::ChartAxisAssign::PRIMARY_Y;
bool bHasMeanValueLine = false;
Reference< beans::XPropertySet > xPropSet;
tLabelValuesDataPair aSeriesLabelValuesPair;
@@ -2671,10 +2670,10 @@ void SchXMLExportHelper_Impl::exportSeries(
sal_Int32 nSeqIdx=0;
for( ; nSeqIdx
xTempValueSeq( aSeqCnt[nSeqIdx]->getValues() );
if( nMainSequenceIndex==-1 )
{
+OUString aRole;
Reference< beans::XPropertySet > xSeqProp(
xTempValueSeq, uno::UNO_QUERY );
if( xSeqProp.is())
xSeqProp->
[Libreoffice-commits] core.git: vcl/backendtest vcl/qt5 vcl/source vcl/unx
vcl/backendtest/VisualBackendTest.cxx|6 ++
vcl/qt5/Qt5Instance.cxx |3 +--
vcl/source/bitmap/BitmapScaleSuperFilter.cxx |4 ++--
vcl/source/control/button.cxx|4 ++--
vcl/source/control/field.cxx |7 ---
vcl/source/control/imp_listbox.cxx |3 +--
vcl/source/control/slider.cxx|3 +--
vcl/source/filter/graphicfilter2.cxx | 23 +++
vcl/source/filter/igif/decode.cxx|3 +--
vcl/source/filter/igif/gifread.cxx |6 +++---
vcl/source/fontsubset/ttcr.cxx |6 ++
vcl/source/gdi/bitmapex.cxx |5 ++---
vcl/source/gdi/pdfwriter_impl.cxx|5 ++---
vcl/source/gdi/svmconverter.cxx |3 +--
vcl/source/graphic/GraphicObject.cxx |5 +
vcl/source/outdev/text.cxx |9 -
vcl/source/treelist/imap.cxx |2 +-
vcl/source/treelist/treelistbox.cxx |7 +--
vcl/source/window/dlgctrl.cxx|4 ++--
vcl/source/window/menu.cxx |4 ++--
vcl/source/window/winproc.cxx| 12 +---
vcl/unx/generic/app/wmadaptor.cxx| 12
vcl/unx/generic/gdi/cairo_xlib_cairo.cxx |4 +---
vcl/unx/generic/gdi/gdiimpl.cxx |3 +--
vcl/unx/generic/gdi/salbmp.cxx |2 +-
vcl/unx/generic/window/salframe.cxx |3 +--
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx|4 ++--
vcl/unx/gtk3/gtk3salprn-gtk.cxx |2 +-
28 files changed, 62 insertions(+), 92 deletions(-)
New commits:
commit cc2b7c1f930bc05253153f3c8381fb4fb352f3ca
Author: Noel
AuthorDate: Thu Oct 1 11:01:41 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Oct 1 12:19:27 2020 +0200
loplugin:reducevarscope in vcl
Change-Id: I768aa9bd87913bc20351fb631a6326fe01f777b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103748
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/backendtest/VisualBackendTest.cxx
b/vcl/backendtest/VisualBackendTest.cxx
index 8473dc193012..0383dfab6a2d 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -662,9 +662,6 @@ public:
long nWidth = aSize.Width();
long nHeight = aSize.Height();
-tools::Rectangle aRectangle;
-size_t index = 0;
-
if (mnTest % gnNumberOfTests == 0)
{
testRectangles(rRenderContext, nWidth, nHeight, false);
@@ -704,8 +701,9 @@ public:
else if (mnTest % gnNumberOfTests == 9)
{
std::vector aRegions = setupRegions(2, 1,
nWidth, nHeight);
+size_t index = 0;
-aRectangle = aRegions[index++];
+tools::Rectangle aRectangle = aRegions[index++];
{
vcl::test::OutputDeviceTestAnotherOutDev aOutDevTest;
Bitmap aBitmap = aOutDevTest.setupDrawOutDev();
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 1868042cdb6d..bba348890898 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -560,7 +560,6 @@ void
Qt5Instance::AllocFakeCmdlineArgs(std::unique_ptr& rFakeArgv,
SAL_INFO("vcl.qt5", "qt version string is " << aVersion);
const sal_uInt32 nParams = osl_getCommandArgCount();
-OString aDisplay;
sal_uInt32 nDisplayValueIdx = 0;
OUString aParam, aBin;
@@ -585,7 +584,7 @@ void
Qt5Instance::AllocFakeCmdlineArgs(std::unique_ptr& rFakeArgv,
{
aFakeArgvFreeable.emplace_back(strdup("-display"));
osl_getCommandArg(nDisplayValueIdx, &aParam.pData);
-aDisplay = OUStringToOString(aParam, osl_getThreadTextEncoding());
+OString aDisplay = OUStringToOString(aParam,
osl_getThreadTextEncoding());
aFakeArgvFreeable.emplace_back(strdup(aDisplay.getStr()));
}
rFakeArgvFreeable.swap(aFakeArgvFreeable);
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index 42d2897143f0..97ceeb45ad35 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -861,7 +861,7 @@ BitmapEx BitmapScaleSuperFilter::execute(BitmapEx const&
rBitmap) const
const long nDstW = FRound(aSizePix.Width() * fScaleX);
const long nDstH = FRound(aSizePix.Height() * fScaleY);
-const double fScaleThresh = 0.6;
+constexpr double fScaleThresh = 0.6;
if (nDstW <= 1 || nDstH <= 1)
return BitmapEx();
@@ -898,7 +898,6 @@ BitmapEx BitmapScaleSuperFilter::execute(BitmapEx const&
rBitmap) const
BitmapScopedWriteAccess pWriteAccess(aOutBmp);
-const long nStartY = 0;
const long nEndY = nDstH - 1;
if (pReadAccess && pWriteAccess)
@@ -967,6 +966,7 @@ BitmapEx BitmapScaleSuperFilter::e
[Libreoffice-commits] core.git: compilerplugins/clang include/sfx2 include/svx svx/source
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 248 -- compilerplugins/clang/unusedfields.py |4 compilerplugins/clang/unusedfields.readonly.results | 96 +-- compilerplugins/clang/unusedfields.untouched.results| 166 ++ compilerplugins/clang/unusedfields.writeonly.results| 202 +++- include/sfx2/infobar.hxx|1 include/svx/galleryobjectcollection.hxx |1 svx/source/gallery2/galleryobjectcollection.cxx |4 8 files changed, 308 insertions(+), 414 deletions(-) New commits: commit 5ed9f4638e1ff12b3246a66ffee8dd9dd74b9693 Author: Noel AuthorDate: Thu Oct 1 09:08:43 2020 +0200 Commit: Noel Grandin CommitDate: Thu Oct 1 12:12:46 2020 +0200 loplugin:unusedfields Change-Id: Icd1dc03c2f783e11e3e52038a8ae9f19705561c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103746 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index ec951eca363b..3ca3008bd423 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -1,19 +1,3 @@ -avmedia/source/vlc/vlcframegrabber.hxx:34 -avmedia::vlc::VLCFrameGrabber mInstance wrapper::Instance -avmedia/source/vlc/vlcframegrabber.hxx:35 -avmedia::vlc::VLCFrameGrabber mMedia wrapper::Media -avmedia/source/vlc/wrapper/Types.hxx:38 -libvlc_event_t p_obj void * -avmedia/source/vlc/wrapper/Types.hxx:43 -libvlc_event_t::(anonymous union)::(anonymous) dummy1 const char * -avmedia/source/vlc/wrapper/Types.hxx:44 -libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * -avmedia/source/vlc/wrapper/Types.hxx:45 -libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:42:7) -avmedia/source/vlc/wrapper/Types.hxx:46 -libvlc_event_t u union (anonymous union at /home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:40:5) -avmedia/source/vlc/wrapper/Types.hxx:52 -libvlc_track_description_t psz_name char * basegfx/source/polygon/b2dpolygontriangulator.cxx:112 basegfx::(anonymous namespace)::Triangulator maStartEntries basegfx::(anonymous namespace)::EdgeEntries basegfx/source/polygon/b2dtrapezoid.cxx:205 @@ -46,16 +30,10 @@ connectivity/source/commontools/RowFunctionParser.cxx:374 connectivity::(anonymous namespace)::ExpressionGrammar::definition integer ::boost::spirit::classic::rule connectivity/source/commontools/RowFunctionParser.cxx:374 connectivity::(anonymous namespace)::ExpressionGrammar::definition argument ::boost::spirit::classic::rule -connectivity/source/commontools/RowFunctionParser.cxx:375 -connectivity::(anonymous namespace)::ExpressionGrammar::definition andExpression ::boost::spirit::classic::rule connectivity/source/commontools/RowFunctionParser.cxx:375 connectivity::(anonymous namespace)::ExpressionGrammar::definition orExpression ::boost::spirit::classic::rule -connectivity/source/drivers/evoab2/EApi.h:122 -(anonymous) address_format char * -connectivity/source/drivers/evoab2/EApi.h:126 -(anonymous) ext char * -connectivity/source/drivers/evoab2/NStatement.hxx:55 -connectivity::evoab::FieldSort bAscending _Bool +connectivity/source/commontools/RowFunctionParser.cxx:375 +connectivity::(anonymous namespace)::ExpressionGrammar::definition andExpression ::boost::spirit::classic::rule connectivity/source/inc/component/CResultSet.hxx:42 connectivity::component::OComponentResultSet m_bBookmarkable _Bool connectivity/source/inc/dbase/DResultSet.hxx:41 @@ -84,7 +62,7 @@ connectivity/source/inc/java/lang/Object.hxx:38 connectivity::SDBThreadAttach m_aGuard jvmaccess::class VirtualMachine::AttachGuard cppcanvas/source/mtfrenderer/textaction.cxx:808 cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextLineInfo const tools::TextLineInfo -cppcanvas/source/mtfrenderer/textaction.cxx:1641 +cppcanvas/source/mtfrenderer/textaction.cxx:1643 cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo const tools::TextLineInfo cppu/source/threadpool/threadpool.cxx:365 _uno_ThreadPool dummy sal_Int32 @@ -132,7 +110,7 @@ cppu/source/uno/check.cxx:258 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 cui/source/dialogs/colorpicker.cxx:736 cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class cui::(anonymous namespace)::ColorPreviewControl -cui/source/factory/dlgfact.cxx:1410 +cui/source/factory/dlgfact.cxx:1389 (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet cui/source/inc/AdditionsDialog.hxx:57 Add
[Libreoffice-commits] core.git: distro-configs/Jenkins
distro-configs/Jenkins/android_aarch64 |2 ++ distro-configs/Jenkins/android_arm |2 ++ distro-configs/Jenkins/android_common.conf |6 ++ distro-configs/Jenkins/android_x86 |2 ++ distro-configs/Jenkins/android_x86_64 |2 ++ 5 files changed, 14 insertions(+) New commits: commit 346c4104c3ceac9d4f61e2e886d38661fa917742 Author: Christian Lohmaier AuthorDate: Wed Sep 30 18:26:03 2020 +0200 Commit: Christian Lohmaier CommitDate: Thu Oct 1 11:50:10 2020 +0200 add distro-configs for jenkins android builds Change-Id: I7923c16670d53bb52dac771776093d4b06fd05b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103725 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/distro-configs/Jenkins/android_aarch64 b/distro-configs/Jenkins/android_aarch64 new file mode 100644 index ..9655534087f7 --- /dev/null +++ b/distro-configs/Jenkins/android_aarch64 @@ -0,0 +1,2 @@ +INCLUDE:LibreOfficeAndroidAarch64 +INCLUDE:Jenkins/android_common diff --git a/distro-configs/Jenkins/android_arm b/distro-configs/Jenkins/android_arm new file mode 100644 index ..444f7058fd2d --- /dev/null +++ b/distro-configs/Jenkins/android_arm @@ -0,0 +1,2 @@ +INCLUDE:LibreOfficeAndroid +INCLUDE:Jenkins/android_common diff --git a/distro-configs/Jenkins/android_common.conf b/distro-configs/Jenkins/android_common.conf new file mode 100644 index ..b35e5dca819c --- /dev/null +++ b/distro-configs/Jenkins/android_common.conf @@ -0,0 +1,6 @@ +--with-android-sdk=$HOME/Android/Sdk +--with-android-ndk=$HOME/Android/Sdk/ndk/20.1.5948944 +--with-jdk-home=/etc/alternatives/java_sdk_11 +--enable-android-editing +CC_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/gcc +CXX_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/g++ diff --git a/distro-configs/Jenkins/android_x86 b/distro-configs/Jenkins/android_x86 new file mode 100644 index ..59634ba4f9d2 --- /dev/null +++ b/distro-configs/Jenkins/android_x86 @@ -0,0 +1,2 @@ +INCLUDE:LibreOfficeAndroidX86 +INCLUDE:Jenkins/android_common diff --git a/distro-configs/Jenkins/android_x86_64 b/distro-configs/Jenkins/android_x86_64 new file mode 100644 index ..1fd075fdce38 --- /dev/null +++ b/distro-configs/Jenkins/android_x86_64 @@ -0,0 +1,2 @@ +INCLUDE:LibreOfficeAndroidX86_64 +INCLUDE:Jenkins/android_common ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig sfx2/uiconfig uui/uiconfig
cui/uiconfig/ui/password.ui |1 + sfx2/uiconfig/ui/password.ui |1 + uui/uiconfig/ui/password.ui |1 + 3 files changed, 3 insertions(+) New commits: commit 8a4ed7b0040e10cc75d015f244934d00478df7c6 Author: Ayhan Yalçınsoy AuthorDate: Thu Oct 1 10:48:12 2020 +0300 Commit: Heiko Tietze CommitDate: Thu Oct 1 11:26:37 2020 +0200 tdf#128174: Master password dialog misplaced Change-Id: Ib8834c58e6c3af88de3eb7b450076c79fb5edda5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103745 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/password.ui b/cui/uiconfig/ui/password.ui index a96437b4f7ea..9a99506908ba 100644 --- a/cui/uiconfig/ui/password.ui +++ b/cui/uiconfig/ui/password.ui @@ -7,6 +7,7 @@ 6 Set Password True +center 0 0 normal diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui index f8d8b8b0a68b..d20f08b671c2 100644 --- a/sfx2/uiconfig/ui/password.ui +++ b/sfx2/uiconfig/ui/password.ui @@ -7,6 +7,7 @@ 6 Enter Password True +center 0 0 dialog diff --git a/uui/uiconfig/ui/password.ui b/uui/uiconfig/ui/password.ui index 9bc65e37ba51..a98730b69369 100644 --- a/uui/uiconfig/ui/password.ui +++ b/uui/uiconfig/ui/password.ui @@ -7,6 +7,7 @@ 6 Set Password True +center 0 0 dialog ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - 12 commits - download.lst external/expat external/libxml2 external/nss include/o3tl shell/source xmlsecurity/source
Rebased ref, commits from common ancestor:
commit 6c165cc8828c92cac931a428dc0f8d7100dc6ffa
Author: Thorsten Behrens
AuthorDate: Thu Oct 11 16:04:39 2018 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 11:23:51 2020 +0200
nss: fix initialisation order, and system zlib
Change-Id: Ia2d01d384b13c3b293599a186899d8e5bb381064
Reviewed-on: https://gerrit.libreoffice.org/61679
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/external/nss/nss-no-c99.patch b/external/nss/nss-no-c99.patch
index b695683f6d0e..bb8085456c51 100644
--- a/external/nss/nss-no-c99.patch
+++ b/external/nss/nss-no-c99.patch
@@ -1492,7 +1492,6 @@
if (!pubValue) {
crv = CKR_ARGUMENTS_BAD;
goto ecgn_done;
-diff -ur nss/nss/cmd/lib/secutil.c nss_new/nss/cmd/lib/secutil.c
--- a/nss/nss/cmd/lib/secutil.c2018-06-21 11:24:45.0 +0200
+++ b/nss/nss/cmd/lib/secutil.c2018-09-19 13:53:21.922607000 +0200
@@ -217,6 +217,7 @@
@@ -1512,7 +1511,6 @@ diff -ur nss/nss/cmd/lib/secutil.c
nss_new/nss/cmd/lib/secutil.c
PORT_Free(pw);
/* Fall Through */
case PW_PLAINTEXT:
-diff -ur nss/nss/cmd/signtool/javascript.c
nss_new/nss/cmd/signtool/javascript.c
--- a/nss/nss/cmd/signtool/javascript.c2018-06-21 11:24:45.0
+0200
+++ b/nss/nss/cmd/signtool/javascript.c2018-09-21 18:09:42.429614100
+0200
@@ -6,6 +6,7 @@
@@ -1532,7 +1530,6 @@ diff -ur nss/nss/cmd/signtool/javascript.c
nss_new/nss/cmd/signtool/javascript.c
if (c >= sizeof(fn)) {
return PR_FAILURE;
}
-diff -ur nss/nss/cmd/signtool/sign.c nss_new/nss/cmd/signtool/sign.c
--- a/nss/nss/cmd/signtool/sign.c 2018-06-21 11:24:45.0 +0200
+++ b/nss/nss/cmd/signtool/sign.c 2018-09-21 18:12:32.664160400 +0200
@@ -5,6 +5,7 @@
@@ -1609,7 +1606,6 @@ diff -ur nss/nss/cmd/signtool/sign.c
nss_new/nss/cmd/signtool/sign.c
if (count >= sizeof(fullname)) {
return 1;
}
-diff -ur nss/nss/lib/freebl/blake2b.c nss_new/nss/lib/freebl/blake2b.c
--- a/nss/nss/lib/freebl/blake2b.c 2018-06-21 11:24:45.0 +0200
+++ b/nss/nss/lib/freebl/blake2b.c 2018-09-06 16:22:55.312309800 +0200
@@ -147,6 +147,7 @@
@@ -1644,7 +1640,6 @@ diff -ur nss/nss/lib/freebl/blake2b.c
nss_new/nss/lib/freebl/blake2b.c
if (ctx == NULL) {
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return NULL;
-diff -ur nss/nss/lib/freebl/chacha20poly1305.c
nss_new/nss/lib/freebl/chacha20poly1305.c
--- a/nss/nss/lib/freebl/chacha20poly1305.c2018-06-21 11:24:45.0
+0200
+++ b/nss/nss/lib/freebl/chacha20poly1305.c2018-09-07 03:48:50.608015600
+0200
@@ -75,6 +75,8 @@
@@ -1665,7 +1660,6 @@ diff -ur nss/nss/lib/freebl/chacha20poly1305.c
nss_new/nss/lib/freebl/chacha20po
for (i = 0, j = adLen; i < 8; i++, j >>= 8) {
block[i] = j;
}
-diff -ur nss/nss/lib/freebl/ecl/ecp_25519.c
nss_new/nss/lib/freebl/ecl/ecp_25519.c
--- a/nss/nss/lib/freebl/ecl/ecp_25519.c 2018-06-21 11:24:45.0
+0200
+++ b/nss/nss/lib/freebl/ecl/ecp_25519.c 2018-09-07 04:22:09.320906200
+0200
@@ -104,6 +104,7 @@
@@ -1685,7 +1679,6 @@ diff -ur nss/nss/lib/freebl/ecl/ecp_25519.c
nss_new/nss/lib/freebl/ecl/ecp_25519
if (NSS_SecureMemcmpZero(X->data, X->len) == 0) {
return SECFailure;
}
-diff -ur nss/nss/lib/freebl/verified/FStar.c
nss_new/nss/lib/freebl/verified/FStar.c
--- a/nss/nss/lib/freebl/verified/FStar.c 2018-06-21 11:24:45.0
+0200
+++ b/nss/nss/lib/freebl/verified/FStar.c 2018-09-10 01:27:51.192382800
+0200
@@ -32,37 +32,45 @@
@@ -1931,7 +1924,6 @@ diff -ur nss/nss/lib/freebl/verified/FStar.c
nss_new/nss/lib/freebl/verified/FSt
}
FStar_UInt128_uint128
-diff -ur nss/nss/lib/freebl/verified/Hacl_Chacha20.c
nss_new/nss/lib/freebl/verified/Hacl_Chacha20.c
--- a/nss/nss/lib/freebl/verified/Hacl_Chacha20.c 2018-06-21
11:24:45.0 +0200
+++ b/nss/nss/lib/freebl/verified/Hacl_Chacha20.c 2018-09-07
05:07:09.66075 +0200
@@ -18,7 +18,8 @@
@@ -2084,7 +2076,6 @@ diff -ur nss/nss/lib/freebl/verified/Hacl_Chacha20.c
nss_new/nss/lib/freebl/veri
uint8_t *b = plain + (uint32_t)64U * i;
uint8_t *o = output + (uint32_t)64U * i;
Hacl_Impl_Chacha20_update(o, b, st, ctr + i);
-diff -ur nss/nss/lib/freebl/verified/Hacl_Chacha20_Vec128.c
nss_new/nss/lib/freebl/verified/Hacl_Chacha20_Vec128.c
--- a/nss/nss/lib/freebl/verified/Hacl_Chacha20_Vec128.c 2018-06-21
11:24:45.0 +0200
+++ b/nss/nss/lib/freebl/verified/Hacl_Chacha20_Vec128.c 2018-09-07
05:31:17.778914000 +0200
@@ -42,53 +42,83 @@
@@ -2364,9 +2355,9 @@ diff -ur
nss/nss/lib/freebl/verified/Hacl_Chacha20_Vec128.c nss_new/nss/lib/free
Hacl_Impl_Chacha20_Vec128_init(st, k, n1, ctr);
Hacl_Impl_Chacha20_Vec128_chacha20_counter_mode(output, plain, len, st);
}
-diff -ur n
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - 5 commits - download.lst external/nss xmlsecurity/source
download.lst |4
external/nss/UnpackedTarball_nss.mk |7
external/nss/nss-glib2.5-support.patch | 53
external/nss/nss-no-c99.patch| 2503 ++-
external/nss/nss.patch | 120 -
external/nss/nss.windowbuild.patch.0 | 55
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 14
7 files changed, 2590 insertions(+), 166 deletions(-)
New commits:
commit 032a3ab15b9e0c2b9ce453733ab1eeb4ce5c85f8
Author: Thorsten Behrens
AuthorDate: Thu Oct 11 16:04:39 2018 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 10:20:50 2020 +0200
nss: fix initialisation order, and system zlib
Change-Id: Ia2d01d384b13c3b293599a186899d8e5bb381064
Reviewed-on: https://gerrit.libreoffice.org/61679
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/external/nss/nss-no-c99.patch b/external/nss/nss-no-c99.patch
index b695683f6d0e..bb8085456c51 100644
--- a/external/nss/nss-no-c99.patch
+++ b/external/nss/nss-no-c99.patch
@@ -1492,7 +1492,6 @@
if (!pubValue) {
crv = CKR_ARGUMENTS_BAD;
goto ecgn_done;
-diff -ur nss/nss/cmd/lib/secutil.c nss_new/nss/cmd/lib/secutil.c
--- a/nss/nss/cmd/lib/secutil.c2018-06-21 11:24:45.0 +0200
+++ b/nss/nss/cmd/lib/secutil.c2018-09-19 13:53:21.922607000 +0200
@@ -217,6 +217,7 @@
@@ -1512,7 +1511,6 @@ diff -ur nss/nss/cmd/lib/secutil.c
nss_new/nss/cmd/lib/secutil.c
PORT_Free(pw);
/* Fall Through */
case PW_PLAINTEXT:
-diff -ur nss/nss/cmd/signtool/javascript.c
nss_new/nss/cmd/signtool/javascript.c
--- a/nss/nss/cmd/signtool/javascript.c2018-06-21 11:24:45.0
+0200
+++ b/nss/nss/cmd/signtool/javascript.c2018-09-21 18:09:42.429614100
+0200
@@ -6,6 +6,7 @@
@@ -1532,7 +1530,6 @@ diff -ur nss/nss/cmd/signtool/javascript.c
nss_new/nss/cmd/signtool/javascript.c
if (c >= sizeof(fn)) {
return PR_FAILURE;
}
-diff -ur nss/nss/cmd/signtool/sign.c nss_new/nss/cmd/signtool/sign.c
--- a/nss/nss/cmd/signtool/sign.c 2018-06-21 11:24:45.0 +0200
+++ b/nss/nss/cmd/signtool/sign.c 2018-09-21 18:12:32.664160400 +0200
@@ -5,6 +5,7 @@
@@ -1609,7 +1606,6 @@ diff -ur nss/nss/cmd/signtool/sign.c
nss_new/nss/cmd/signtool/sign.c
if (count >= sizeof(fullname)) {
return 1;
}
-diff -ur nss/nss/lib/freebl/blake2b.c nss_new/nss/lib/freebl/blake2b.c
--- a/nss/nss/lib/freebl/blake2b.c 2018-06-21 11:24:45.0 +0200
+++ b/nss/nss/lib/freebl/blake2b.c 2018-09-06 16:22:55.312309800 +0200
@@ -147,6 +147,7 @@
@@ -1644,7 +1640,6 @@ diff -ur nss/nss/lib/freebl/blake2b.c
nss_new/nss/lib/freebl/blake2b.c
if (ctx == NULL) {
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return NULL;
-diff -ur nss/nss/lib/freebl/chacha20poly1305.c
nss_new/nss/lib/freebl/chacha20poly1305.c
--- a/nss/nss/lib/freebl/chacha20poly1305.c2018-06-21 11:24:45.0
+0200
+++ b/nss/nss/lib/freebl/chacha20poly1305.c2018-09-07 03:48:50.608015600
+0200
@@ -75,6 +75,8 @@
@@ -1665,7 +1660,6 @@ diff -ur nss/nss/lib/freebl/chacha20poly1305.c
nss_new/nss/lib/freebl/chacha20po
for (i = 0, j = adLen; i < 8; i++, j >>= 8) {
block[i] = j;
}
-diff -ur nss/nss/lib/freebl/ecl/ecp_25519.c
nss_new/nss/lib/freebl/ecl/ecp_25519.c
--- a/nss/nss/lib/freebl/ecl/ecp_25519.c 2018-06-21 11:24:45.0
+0200
+++ b/nss/nss/lib/freebl/ecl/ecp_25519.c 2018-09-07 04:22:09.320906200
+0200
@@ -104,6 +104,7 @@
@@ -1685,7 +1679,6 @@ diff -ur nss/nss/lib/freebl/ecl/ecp_25519.c
nss_new/nss/lib/freebl/ecl/ecp_25519
if (NSS_SecureMemcmpZero(X->data, X->len) == 0) {
return SECFailure;
}
-diff -ur nss/nss/lib/freebl/verified/FStar.c
nss_new/nss/lib/freebl/verified/FStar.c
--- a/nss/nss/lib/freebl/verified/FStar.c 2018-06-21 11:24:45.0
+0200
+++ b/nss/nss/lib/freebl/verified/FStar.c 2018-09-10 01:27:51.192382800
+0200
@@ -32,37 +32,45 @@
@@ -1931,7 +1924,6 @@ diff -ur nss/nss/lib/freebl/verified/FStar.c
nss_new/nss/lib/freebl/verified/FSt
}
FStar_UInt128_uint128
-diff -ur nss/nss/lib/freebl/verified/Hacl_Chacha20.c
nss_new/nss/lib/freebl/verified/Hacl_Chacha20.c
--- a/nss/nss/lib/freebl/verified/Hacl_Chacha20.c 2018-06-21
11:24:45.0 +0200
+++ b/nss/nss/lib/freebl/verified/Hacl_Chacha20.c 2018-09-07
05:07:09.66075 +0200
@@ -18,7 +18,8 @@
@@ -2084,7 +2076,6 @@ diff -ur nss/nss/lib/freebl/verified/Hacl_Chacha20.c
nss_new/nss/lib/freebl/veri
uint8_t *b = plain + (uint32_t)64U * i;
uint8_t *o = output + (uint32_t)64U * i;
Hacl_Impl_Chacha20_update(o, b, st, ctr + i);
-diff -ur nss/nss/lib/freebl/verified/Hacl_Chacha20_Vec128.c
nss_new/nss/lib/freebl/verified/Hacl_Chacha20_Vec128.c
--- a/nss/nss/lib/
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - 7 commits - configure.ac include/tools include/vcl include/xmlsecurity sal/osl sfx2/source tools/source vcl/Library_vcl.mk vcl/qa vc
Rebased ref, commits from common ancestor:
commit e951f98ef5d713a130b8c1ef28bff79de8278f51
Author: Samuel Mehrbrodt
AuthorDate: Tue Sep 29 09:22:04 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 10:53:30 2020 +0200
Release 5.4.11
Change-Id: I94f4cb91b1cf92722ff43d3561ba0cf2405a6a29
diff --git a/configure.ac b/configure.ac
index 83fe089baf59..af7fc01b8195 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[5.4.10.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.11.0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit f1682f0f324c4298ef1a5d33c3c68b6a8471f3ae
Author: Miklos Vajna
AuthorDate: Fri Sep 4 17:17:48 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 10:53:30 2020 +0200
xmlsecurity: pdf incremental updates that are non-commenting are invalid
I.e. it's OK to add incremental updates for annotation/commenting
purposes and that doesn't invalite existing signatures. Everything else
does.
(cherry picked from commit 61834cd574568613f0b0a2ee099a60fa5a8d9804)
Conflicts:
include/vcl/filter/PDFiumLibrary.hxx
vcl/source/pdf/PDFiumLibrary.cxx
Conflicts:
xmlsecurity/qa/unit/signing/signing.cxx
Change-Id: I4607c242b3c6f6b01517b02407e9e7a095e2e069
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 0bc3766807fa..608f7f0adde0 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -257,6 +257,7 @@ public:
SvStream& WriteOString(const OString& rStr)
{ return WriteCharPtr(rStr.getStr()); }
SvStream& WriteStream( SvStream& rStream );
+sal_uInt64 WriteStream( SvStream& rStream, sal_uInt64 nSize );
SvStream& WriteBool( bool b )
{ return WriteUChar(static_cast(b)); }
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index b9bceabb8acf..ffc70874c19b 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -17,11 +17,16 @@
#include
#include
#include
+#include
+
+#include
namespace vcl
{
namespace pdf
{
+class PDFiumDocument;
+
class VCL_DLLPUBLIC PDFium final
{
private:
@@ -33,6 +38,49 @@ public:
~PDFium();
};
+class VCL_DLLPUBLIC PDFiumPage final
+{
+private:
+FPDF_PAGE mpPage;
+
+private:
+PDFiumPage(const PDFiumPage&) = delete;
+PDFiumPage& operator=(const PDFiumPage&) = delete;
+
+public:
+PDFiumPage(FPDF_PAGE pPage)
+: mpPage(pPage)
+{
+}
+
+~PDFiumPage()
+{
+if (mpPage)
+FPDF_ClosePage(mpPage);
+}
+
+/// Get bitmap checksum of the page, without annotations/commenting.
+BitmapChecksum getChecksum();
+};
+
+class VCL_DLLPUBLIC PDFiumDocument final
+{
+private:
+FPDF_DOCUMENT mpPdfDocument;
+
+private:
+PDFiumDocument(const PDFiumDocument&) = delete;
+PDFiumDocument& operator=(const PDFiumDocument&) = delete;
+
+public:
+PDFiumDocument(FPDF_DOCUMENT pPdfDocument);
+~PDFiumDocument();
+
+int getPageCount();
+
+std::unique_ptr openPage(int nIndex);
+};
+
struct PDFiumLibrary : public rtl::StaticWithInit,
PDFiumLibrary>
{
std::shared_ptr operator()() { return std::make_shared(); }
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 488348719892..b83729e35fbf 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1176,6 +1176,27 @@ SvStream& SvStream::WriteStream( SvStream& rStream )
return *this;
}
+sal_uInt64 SvStream::WriteStream( SvStream& rStream, sal_uInt64 nSize )
+{
+const sal_uInt32 cBufLen = 0x8000;
+std::unique_ptr pBuf( new char[ cBufLen ] );
+sal_uInt32 nCurBufLen = cBufLen;
+sal_uInt32 nCount;
+sal_uInt64 nWriteSize = nSize;
+
+do {
+if ( nSize >= nCurBufLen )
+nWriteSize -= nCurBufLen;
+else
+nCurBufLen = nWriteSize;
+nCount = rStream.ReadBytes( pBuf.get(), nCurBufLen );
+WriteBytes( pBuf.get(), nCount );
+}
+while( nWriteSize && nCount == nCurBufLen );
+
+return nSize - nWriteSize;
+}
+
OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet )
{
// read UTF-16 string directly from stream ?
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 5f487b15f48b..38eb88a99db0 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -15,6 +15,10 @@
#include
#include
+#include
+#include
+#include
+
namespace vcl
{
namespace pdf
@@ -31,6 +35,57 @@ PDFium::PDFium()
PDFium::~PDFium() { FPDF_DestroyLibrary(
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - winaccessibility/source
winaccessibility/source/UAccCOM/MAccessible.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit d4e4c74829e5c966a0149104228d84be503dc72d
Author: Michael Weghorn
AuthorDate: Wed Jun 3 14:07:39 2020 +0200
Commit: Thorsten Behrens
CommitDate: Thu Oct 1 10:47:00 2020 +0200
tdf#133633 winaccessibility: Add null check
The call to 'AccObjectManagerAgent::GetIAccessibleFromResID'
may set 'pImAcc' to nullptr here (s.
'AccObjectWinManager::GetIAccessibleFromResID', which is called
from there), so handle that case gracefully.
Change-Id: I0dbd48974fd012ff086835b147cd9b9cfc8a052b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95430
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit f5f9cac0c5f04246718c438b4673b36e803fda29)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95420
Reviewed-by: Michael Stahl
(cherry picked from commit bf5e0dc9bd54069f57f41de8746dc29d0ec41061)
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 25c86411f4f6..056ef7c2eb5a 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -784,6 +784,10 @@ STDMETHODIMP CMAccessible::get_accFocus(VARIANT *pvarChild)
{
IMAccessible* pIMAcc = nullptr;
g_pAgent->GetIAccessibleFromResID(m_dFocusChildID,&pIMAcc);
+if (pIMAcc == nullptr)
+{
+return E_FAIL;
+}
pIMAcc->AddRef();
pvarChild->vt = VT_DISPATCH;
pvarChild->pdispVal = pIMAcc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - 2 commits - configure.ac include/tools include/vcl tools/source vcl/source xmlsecurity/Library_xmlsecurity.mk xmlsecurity/qa xmlsecu
Rebased ref, commits from common ancestor:
commit 3ac43088158476d32701d00e7d517440b128c1a4
Author: Samuel Mehrbrodt
AuthorDate: Tue Sep 29 09:22:04 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 10:45:07 2020 +0200
Release 5.4.11
Change-Id: I94f4cb91b1cf92722ff43d3561ba0cf2405a6a29
diff --git a/configure.ac b/configure.ac
index 83fe089baf59..af7fc01b8195 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[5.4.10.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.11.0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit fba3e52b85c2d4d4a5e2f7394c4fe6f3a70405b9
Author: Miklos Vajna
AuthorDate: Fri Sep 4 17:17:48 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 10:45:03 2020 +0200
xmlsecurity: pdf incremental updates that are non-commenting are invalid
I.e. it's OK to add incremental updates for annotation/commenting
purposes and that doesn't invalite existing signatures. Everything else
does.
(cherry picked from commit 61834cd574568613f0b0a2ee099a60fa5a8d9804)
Conflicts:
include/vcl/filter/PDFiumLibrary.hxx
vcl/source/pdf/PDFiumLibrary.cxx
Conflicts:
xmlsecurity/qa/unit/signing/signing.cxx
Change-Id: I4607c242b3c6f6b01517b02407e9e7a095e2e069
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 0bc3766807fa..608f7f0adde0 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -257,6 +257,7 @@ public:
SvStream& WriteOString(const OString& rStr)
{ return WriteCharPtr(rStr.getStr()); }
SvStream& WriteStream( SvStream& rStream );
+sal_uInt64 WriteStream( SvStream& rStream, sal_uInt64 nSize );
SvStream& WriteBool( bool b )
{ return WriteUChar(static_cast(b)); }
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index b9bceabb8acf..ffc70874c19b 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -17,11 +17,16 @@
#include
#include
#include
+#include
+
+#include
namespace vcl
{
namespace pdf
{
+class PDFiumDocument;
+
class VCL_DLLPUBLIC PDFium final
{
private:
@@ -33,6 +38,49 @@ public:
~PDFium();
};
+class VCL_DLLPUBLIC PDFiumPage final
+{
+private:
+FPDF_PAGE mpPage;
+
+private:
+PDFiumPage(const PDFiumPage&) = delete;
+PDFiumPage& operator=(const PDFiumPage&) = delete;
+
+public:
+PDFiumPage(FPDF_PAGE pPage)
+: mpPage(pPage)
+{
+}
+
+~PDFiumPage()
+{
+if (mpPage)
+FPDF_ClosePage(mpPage);
+}
+
+/// Get bitmap checksum of the page, without annotations/commenting.
+BitmapChecksum getChecksum();
+};
+
+class VCL_DLLPUBLIC PDFiumDocument final
+{
+private:
+FPDF_DOCUMENT mpPdfDocument;
+
+private:
+PDFiumDocument(const PDFiumDocument&) = delete;
+PDFiumDocument& operator=(const PDFiumDocument&) = delete;
+
+public:
+PDFiumDocument(FPDF_DOCUMENT pPdfDocument);
+~PDFiumDocument();
+
+int getPageCount();
+
+std::unique_ptr openPage(int nIndex);
+};
+
struct PDFiumLibrary : public rtl::StaticWithInit,
PDFiumLibrary>
{
std::shared_ptr operator()() { return std::make_shared(); }
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 488348719892..b83729e35fbf 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1176,6 +1176,27 @@ SvStream& SvStream::WriteStream( SvStream& rStream )
return *this;
}
+sal_uInt64 SvStream::WriteStream( SvStream& rStream, sal_uInt64 nSize )
+{
+const sal_uInt32 cBufLen = 0x8000;
+std::unique_ptr pBuf( new char[ cBufLen ] );
+sal_uInt32 nCurBufLen = cBufLen;
+sal_uInt32 nCount;
+sal_uInt64 nWriteSize = nSize;
+
+do {
+if ( nSize >= nCurBufLen )
+nWriteSize -= nCurBufLen;
+else
+nCurBufLen = nWriteSize;
+nCount = rStream.ReadBytes( pBuf.get(), nCurBufLen );
+WriteBytes( pBuf.get(), nCount );
+}
+while( nWriteSize && nCount == nCurBufLen );
+
+return nSize - nWriteSize;
+}
+
OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet )
{
// read UTF-16 string directly from stream ?
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 5f487b15f48b..38eb88a99db0 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -15,6 +15,10 @@
#include
#include
+#include
+#include
+#include
+
namespace vcl
{
namespace pdf
@@ -31,6 +35,57 @@ PDFium::PDFium()
PDFium::~PDFium() { FPDF_DestroyLibrary(
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf136441_commentInFootnote.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx|6 ++
sw/source/filter/ww8/wrtw8nds.cxx |4 +++-
3 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 270604a11022ab4fb9a3ac299d9a42e1d8464c47
Author: Justin Luth
AuthorDate: Sat Sep 5 13:38:04 2020 +0300
Commit: Michael Stahl
CommitDate: Thu Oct 1 10:42:21 2020 +0200
tdf#136441 ms export: don't export comments in footnotes
Microsoft UI does not allow comments in footnotes,
or in headers/footers, or endnotes,
so just throw them away for all MS formats.
This avoids the biggest problem,
which was an error in LO reading the DOCX.
Prior to this bug fix, the status was:
DOCX:
Word 2016 opens it ok, but no comment in footnote.
Word 2003 hangs.
LO loads but has a SAX error the user must ignore,
and no comment seen in the footnote anyway.
DOC:
Word 2016 opens, but misses the main body text,
and of course no comment in footnote.
Word 2003 opens, sees the main body text just fine,
and no comment in footnote.
LO loads, but no comment seen in footnote anyway.
RTF:
Word 2016/2003 open, and no comment in footnote.
LO loads, but no comment seen in footnote anyway.
If the SAX error problem could be fixed, then perhaps
it would be worth allowing LO to export comments
to DOCX for its own benefit. In that case, allow
case SwFieldIds::Postit:
PostitField( pField );
This patch does not fix the problem where the body
text is missing in Word 2016 in DOC format.
Change-Id: I0b7389616a2207d41ae525dbc0b2eea536364d90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102074
Tested-by: Jenkins
Reviewed-by: Justin Luth
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103630
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlexport/data/tdf136441_commentInFootnote.odt
b/sw/qa/extras/ooxmlexport/data/tdf136441_commentInFootnote.odt
new file mode 100644
index ..61c9632b3972
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf136441_commentInFootnote.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index ab204e9c5e67..1950b8349697 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -114,6 +114,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf135973, "tdf135973.odt")
}
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf136441_commentInFootnote,
"tdf136441_commentInFootnote.odt")
+{
+// failed to load without error if footnote contained a comment.
+// (MS Word's UI doesn't allow adding comments to a footnote.)
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx")
{
CPPUNIT_ASSERT_EQUAL(2, getPages());
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index ec6f63cb222b..4f3b98089658 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2392,7 +2392,9 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
// Append bookmarks in this range after flys, exclusive of final
// position of this range
AppendBookmarks( rNode, nCurrentPos, nNextAttr - nCurrentPos );
-AppendAnnotationMarks(aAttrIter, nCurrentPos, nNextAttr -
nCurrentPos);
+//Sadly only possible for word in main document text
+if ( m_nTextTyp == TXT_MAINTEXT )
+AppendAnnotationMarks(aAttrIter, nCurrentPos, nNextAttr -
nCurrentPos);
// At the moment smarttags are only written for paragraphs, at the
// beginning of the paragraph.
___
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/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf134784.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx| 11 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ++-
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 2f40b190b22213a80aa11021f69619f1b72838be
Author: László Németh
AuthorDate: Tue Sep 15 16:13:34 2020 +0200
Commit: Xisco Fauli
CommitDate: Thu Oct 1 10:33:46 2020 +0200
tdf#134784 DOCX import: fix shape paragraph margins
based on bad style inheritance.
Regression from commit dc0300eac3b755bc207cd1fe87217f4ebaeb9f58
(tdf#118521 DOCX import: fix paragraph margin from paragraph style),
revealing the problematic m_sCurrentParaStyleName, see also
commit 8920d865ee148518bf71f71ce1866b24cc17c07e for more information.
Change-Id: Icc7f70452d946d56dc840d39545d850f74f97ebc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102774
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit c04ee66c7cfeb725d637b0f9ec3e3b1f8776bfe9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103585
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/ooxmlexport/data/tdf134784.docx
b/sw/qa/extras/ooxmlexport/data/tdf134784.docx
new file mode 100644
index ..2099db66e0f6
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf134784.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 087373aaf7e4..984564415989 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -790,6 +790,17 @@ DECLARE_OOXMLEXPORT_TEST(testMarginsFromStyle,
"margins_from_style.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(600),
getProperty(getParagraph(3), "ParaBottomMargin"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf134784, "tdf134784.docx")
+{
+uno::Reference textbox(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(3, getParagraphs(textbox));
+uno::Reference xParagraph = getParagraphOfText(1,
textbox);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(212), getProperty(xParagraph,
"ParaBottomMargin"));
+
+// This wasn't zero (it was inherited from style of the previous paragraph
in the main text)
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xParagraph,
"ParaTopMargin"));
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf104348_contextMargin,
"tdf104348_contextMargin.docx")
{
// tdf#104348 shows that ContextMargin belongs with Top/Bottom handling
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0e9e87f6df46..dc45aabdb27d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -772,8 +772,13 @@ uno::Sequence< style::TabStop >
DomainMapper_Impl::GetCurrentTabStopAndClear()
OUString DomainMapper_Impl::GetCurrentParaStyleName()
{
+OUString sName;
// use saved currParaStyleName as a fallback, in case no particular para
style name applied.
-OUString sName = m_sCurrentParaStyleName;
+// tdf#134784 except in the case of first paragraph of shapes to avoid bad
fallback.
+// TODO fix this "highly inaccurate" m_sCurrentParaStyleName
+if ( !m_bIsFirstParaInShape )
+sName = m_sCurrentParaStyleName;
+
PropertyMapPtr pParaContext = GetTopContextOfType(CONTEXT_PARAGRAPH);
if ( pParaContext && pParaContext->isSet(PROP_PARA_STYLE_NAME) )
pParaContext->getProperty(PROP_PARA_STYLE_NAME)->second >>= sName;
___
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/font/fontcharmap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ebafb8740b999dc3f508a93526d4f6ef5c3d3446
Author: Caolán McNamara
AuthorDate: Tue Sep 29 20:59:40 2020 +0100
Commit: Xisco Fauli
CommitDate: Thu Oct 1 10:33:26 2020 +0200
ofz#25989 cmap parsing
Change-Id: I048e5d88d5926a4afa75afab18db5ca6354e2454
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103656
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index 229f4f36789f..c29fd3cdbd22 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -228,7 +228,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength,
CmapResult& rResult )
// update the glyphid-array with the glyphs in this range
pStartGlyphs[i] = -static_cast(aGlyphIdArray.size());
const unsigned char* pGlyphIdPtr = pOffsetBase + 2*i +
nRangeOffset;
-const size_t nRemainingSize = pEndValidArea - pGlyphIdPtr;
+const size_t nRemainingSize = pEndValidArea >= pGlyphIdPtr ?
pEndValidArea - pGlyphIdPtr : 0;
const size_t nMaxPossibleRecords = nRemainingSize/2;
if (nMaxPossibleRecords == 0) { // no sane font should
trigger this
SAL_WARN("vcl.gdi", "More indexes claimed that space
available in font!");
___
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/inc sw/source
sw/inc/AnnotationWin.hxx|5 -
sw/source/uibase/docvw/AnnotationMenuButton.cxx |6 +-
sw/source/uibase/docvw/AnnotationWin2.cxx | 15 +--
3 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit b1574603d61914fc2eb498e99b199ca81d0bf578
Author: Caolán McNamara
AuthorDate: Mon Sep 28 12:32:56 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Oct 1 09:59:00 2020 +0200
Related: tdf#136985 restore focus to doc it wasn't initially in the comment
after processing a menu command if we grabbed focus to a comment at the
start
of the the menu command processing
Change-Id: I6cf4b59fc0c5d3e09578cb0466b15ae358cfb0ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103568
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 32630399c9d0..e8e16158e26a 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -195,7 +195,10 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public
vcl::Window
bool IsThreadResolved();
// Set this SwAnnotationWin as the currently active one
-void SetActiveSidebarWin();
+// return false if it was already active
+bool SetActiveSidebarWin();
+// Unset this SwAnnotationWin as the currently active one
+void UnsetActiveSidebarWin();
/// Find the first annotation for the thread which this annotation is
in.
/// This may be the same annotation as this one.
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 58e4f7a8a610..847905385577 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -72,7 +72,7 @@ void AnnotationMenuButton::Select()
// tdf#136682 ensure this is the currently active sidebar win so the
command
// operates in an active sidebar context
-mrSidebarWin.SetActiveSidebarWin();
+bool bSwitchedFocus = mrSidebarWin.SetActiveSidebarWin();
if (sIdent == "reply")
mrSidebarWin.ExecuteCommand(FN_REPLY);
@@ -86,6 +86,10 @@ void AnnotationMenuButton::Select()
mrSidebarWin.ExecuteCommand(FN_DELETE_ALL_NOTES);
else if (sIdent == "formatall")
mrSidebarWin.ExecuteCommand(FN_FORMAT_ALL_NOTES);
+
+if (bSwitchedFocus)
+mrSidebarWin.UnsetActiveSidebarWin();
+mrSidebarWin.GrabFocusToDocument();
}
void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index f3734704e1ed..9c3539f2e6d7 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -1358,14 +1358,25 @@ IMPL_LINK( SwAnnotationWin, WindowEventListener,
VclWindowEvent&, rEvent, void )
}
}
-void SwAnnotationWin::SetActiveSidebarWin()
+bool SwAnnotationWin::SetActiveSidebarWin()
{
if (mrMgr.GetActiveSidebarWin() == this)
-return;
+return false;
const bool bLockView = mrView.GetWrtShell().IsViewLocked();
mrView.GetWrtShell().LockView( true );
mrMgr.SetActiveSidebarWin(this);
mrView.GetWrtShell().LockView( bLockView );
+return true;
+}
+
+void SwAnnotationWin::UnsetActiveSidebarWin()
+{
+if (mrMgr.GetActiveSidebarWin() != this)
+return;
+const bool bLockView = mrView.GetWrtShell().IsViewLocked();
+mrView.GetWrtShell().LockView( true );
+mrMgr.SetActiveSidebarWin(nullptr);
+mrView.GetWrtShell().LockView( bLockView );
}
IMPL_LINK(SwAnnotationWin, ScrollHdl, ScrollBar*, pScroll, void)
___
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' - dbaccess/source include/svtools svtools/source
dbaccess/source/ui/control/RelationControl.cxx |2 +-
include/svtools/editbrowsebox.hxx | 25 +++--
svtools/source/brwbox/ebbcontrols.cxx |8
svtools/source/brwbox/editbrowsebox.cxx| 13 ++---
svtools/source/brwbox/editbrowsebox2.cxx |2 +-
5 files changed, 39 insertions(+), 11 deletions(-)
New commits:
commit 9d30d3bb93171a12655dc89066fe065e2c2af658
Author: Caolán McNamara
AuthorDate: Sun Sep 27 20:06:17 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Oct 1 09:55:35 2020 +0200
Related: tdf#137016 check if subcontrol has the focus
backport some required pieces from master to support that
Change-Id: I632188bc0512c9d8935bd0898c96e066881ebeb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103524
Tested-by: Jenkins
Reviewed-by: Julien Nabet
Reviewed-by: Miklos Vajna
diff --git a/dbaccess/source/ui/control/RelationControl.cxx
b/dbaccess/source/ui/control/RelationControl.cxx
index d9de91ba494b..69f0a00cae2d 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -184,7 +184,7 @@ namespace dbaui
bool ORelationControl::PreNotify(NotifyEvent& rNEvt)
{
-if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS &&
!HasChildPathFocus() )
+if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS &&
!HasChildPathFocus() && !ControlHasFocus())
PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate),
nullptr, true);
else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
PostUserEvent(LINK(this, ORelationControl, AsynchActivate),
nullptr, true);
diff --git a/include/svtools/editbrowsebox.hxx
b/include/svtools/editbrowsebox.hxx
index ebd968d254ad..5614659d0756 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -316,8 +316,18 @@ namespace svt
DECL_LINK(ModifyHdl, LinkParamNone*, void);
};
+class SVT_DLLPUBLIC ControlBase : public InterimItemWindow
+{
+public:
+ControlBase(vcl::Window* pParent, const OUString& rUIXMLDescription,
const OString& rID)
+: InterimItemWindow(pParent, rUIXMLDescription, rID)
+{
+}
+virtual bool ControlHasFocus() const = 0;
+};
+
//= ComboBoxControl
-class SVT_DLLPUBLIC ComboBoxControl final : public InterimItemWindow
+class SVT_DLLPUBLIC ComboBoxControl final : public ControlBase
{
private:
std::unique_ptr m_xWidget;
@@ -343,6 +353,11 @@ namespace svt
m_aModify2Hdl = rLink;
}
+virtual bool ControlHasFocus() const override
+{
+return m_xWidget && m_xWidget->has_focus();
+}
+
virtual void dispose() override;
private:
@@ -373,7 +388,7 @@ namespace svt
};
//= ListBoxControl
-class SVT_DLLPUBLIC ListBoxControl final : public InterimItemWindow
+class SVT_DLLPUBLIC ListBoxControl final : public ControlBase
{
private:
std::unique_ptr m_xWidget;
@@ -399,6 +414,11 @@ namespace svt
m_aModify2Hdl = rLink;
}
+virtual bool ControlHasFocus() const override
+{
+return m_xWidget && m_xWidget->has_focus();
+}
+
virtual void dispose() override;
private:
DECL_LINK(SelectHdl, weld::ComboBox&, void);
@@ -655,6 +675,7 @@ namespace svt
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32
_nColumnPos,const Point& _rPoint) override;
css::uno::Reference< css::accessibility::XAccessible >
CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState&
eState);
+bool ControlHasFocus() const;
protected:
// creates the accessible which wraps the active cell
voidimplCreateActiveAccessible( );
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index 1e0272aeeea9..e402f0a42a40 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -28,7 +28,7 @@ namespace svt
//= ComboBoxControl
ComboBoxControl::ComboBoxControl(vcl::Window* pParent)
-: InterimItemWindow(pParent, "svt/ui/combocontrol.ui", "ComboControl")
+: ControlBase(pParent, "svt/ui/combocontrol.ui", "ComboControl")
, m_xWidget(m_xBuilder->weld_combo_box("combobox"))
{
m_xWidget->set_entry_width_chars(1); // so a smaller than default
width can be used
@@ -38,7 +38,7 @@ namespace svt
void ComboBoxControl::dispose()
{
m_xWidget.reset();
-InterimItemWindow::dispose();
+ControlBase::dispose();
}
IMPL_LINK_NOARG(ComboBoxControl, SelectHdl, weld::ComboBox&, void)
@@ -111,7 +111,7 @@ namespace svt
//= ListBoxControl
ListBoxControl::ListBoxControl(vcl::Window* pParent)
-: InterimItemWindow(pParent, "
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - config_host/config_qrcodegen.h.in config_host.mk.in configure.ac cui/source distro-configs/LibreOfficeOssFuzz.conf external/qrcodegen Reposit
RepositoryExternal.mk |9 +
config_host.mk.in |1
config_host/config_qrcodegen.h.in | 17 ++
configure.ac | 52 ++---
cui/source/dialogs/QrCodeGenDialog.cxx | 21 +++--
cui/source/inc/QrCodeGenDialog.hxx |4 ++
distro-configs/LibreOfficeOssFuzz.conf |1
external/qrcodegen/Module_qrcodegen.mk |4 ++
8 files changed, 89 insertions(+), 20 deletions(-)
New commits:
commit 77960eb573e548816064690c5b1de5ca18ae9cbd
Author: Caolán McNamara
AuthorDate: Mon Sep 21 17:02:31 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Oct 1 09:54:38 2020 +0200
add an explicit --disable-qrcodegen configure option
Change-Id: If8e965fa955aecdb9e7011bdddc690de9cad0c4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103120
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103157
Reviewed-by: Miklos Vajna
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7f623ac80404..09e860a4987d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4194,6 +4194,8 @@ gb_ExternalProject__use_qrcodegen :=
else # !SYSTEM_QRCODEGEN
+ifneq ($(ENABLE_QRCODEGEN),)
+
define gb_LinkTarget__use_qrcodegen
$(call gb_LinkTarget_use_unpacked,$(1),qrcodegen)
$(call gb_LinkTarget_set_include,$(1),\
@@ -4211,6 +4213,13 @@ $(call
gb_ExternalProject_use_static_libraries,$(1),qrcodegen)
endef
+else # !ENABLE_QRCODEGEN
+
+define gb_LinkTarget__use_qrcodegen
+endef
+
+endif # ENABLE_QRCODEGEN
+
endif # SYSTEM_QRCODEGEN
define gb_LinkTarget__use_dtoa
diff --git a/config_host.mk.in b/config_host.mk.in
index a14fb823c94c..dc3da7e01f60 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -490,6 +490,7 @@ export PYTHON_LIBS=$(gb_SPACE)@PYTHON_LIBS@
export PYTHON_VERSION=@PYTHON_VERSION@
export PYTHON_VERSION_MAJOR=@PYTHON_VERSION_MAJOR@
export PYTHON_VERSION_MINOR=@PYTHON_VERSION_MINOR@
+export ENABLE_QRCODEGEN=@ENABLE_QRCODEGEN@
export QRCODEGEN_CFLAGS=$(gb_SPACE)@QRCODEGEN_CFLAGS@
export QRCODEGEN_LIBS=$(gb_SPACE)@QRCODEGEN_LIBS@
export QT5_CFLAGS=$(gb_SPACE)@QT5_CFLAGS@
diff --git a/config_host/config_qrcodegen.h.in
b/config_host/config_qrcodegen.h.in
new file mode 100644
index ..63388651699f
--- /dev/null
+++ b/config_host/config_qrcodegen.h.in
@@ -0,0 +1,17 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_CONFIG_QRCODEGEN_H
+#define INCLUDED_CONFIG_QRCODEGEN_H
+
+#define ENABLE_QRCODEGEN 0
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 745fe9567773..0e9323283195 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1956,6 +1956,10 @@ AC_ARG_WITH(system-hunspell,
[Use libhunspell already on system.]),,
[with_system_hunspell="$with_system_libs"])
+libo_FUZZ_ARG_ENABLE(qrcodegen,
+AS_HELP_STRING([--disable-qrcodegen],
+[Disable use of qrcodegen external library.]))
+
AC_ARG_WITH(system-qrcodegen,
AS_HELP_STRING([--with-system-qrcodegen],
[Use libqrcodegen already on system.]),,
@@ -10233,26 +10237,39 @@ AC_SUBST(HUNSPELL_LIBS)
dnl ===
dnl Check for system qrcodegen
dnl ===
-AC_MSG_CHECKING([which libqrcodegen to use])
-if test "$with_system_qrcodegen" = "yes"; then
-AC_MSG_RESULT([external])
-SYSTEM_QRCODEGEN=TRUE
-AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
-[AC_MSG_ERROR(qrcodegen headers not found.)], [#include ])
-AC_CHECK_LIB([qrcodegencpp], [main], [:],
-[ AC_MSG_ERROR(qrcodegen C++ library not found.) ], [])
-QRCODEGEN_LIBS=-lqrcodegencpp
-AC_LANG_POP([C++])
-QRCODEGEN_CFLAGS=$(printf '%s' "$QRCODEGEN_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
-FilterLibs "${QRCODEGEN_LIBS}"
-QRCODEGEN_LIBS="${filteredlibs}"
-else
-AC_MSG_RESULT([internal])
+AC_MSG_CHECKING([whether to use libqrcodegen])
+if test "$enable_qrcodegen" = "no"; then
+AC_MSG_RESULT([no])
+ENABLE_QRCODEGEN=
SYSTEM_QRCODEGEN=
-BUILD_TYPE="$BUILD_TYPE QRCODEGEN"
+else
+AC_MSG_RESULT([yes])
+ENABLE_QRCODEGEN=TRUE
+AC_MSG_CHECKING([which libqrcodegen to use])
+if test "$with_system_qrcodegen" = "yes"; then
+AC_MSG_RESULT([external])
+SYSTEM_QRCODEGEN=TRUE
+AC_LANG_PUSH([C++])
+AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
+[AC_MSG_ERROR(qrcodegen headers not found.)], [#include
])
+AC_CHECK_LIB
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source
sfx2/source/dialog/templdlg.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 0f77b8a44e7ee5541c97304d37f0c52cd8275cba
Author: Caolán McNamara
AuthorDate: Thu Sep 17 12:14:25 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Oct 1 09:54:03 2020 +0200
tdf#134598 call FmtSelect to update watercan
Change-Id: Idd88acfdaac66b999b0bcd8cf0a4fe69f7ae6ac5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102926
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 03da396a51b5..4ca4b292cfbf 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -868,7 +868,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const
OUString &rStr, bool bIsCal
{
mxTreeBox->scroll_to_row(*xEntry);
mxTreeBox->select(*xEntry);
-return;
+break;
}
bEntry = mxTreeBox->iter_next(*xEntry);
}
@@ -894,7 +894,6 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const
OUString &rStr, bool bIsCal
mxFmtLb->unselect_all();
mxFmtLb->scroll_to_row(*xEntry);
mxFmtLb->select(*xEntry);
-FmtSelect(nullptr, bIsCallback);
}
}
}
@@ -910,6 +909,12 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const
OUString &rStr, bool bIsCal
}
bWaterDisabled = !IsSafeForWaterCan();
+
+if (!bIsCallback)
+{
+// tdf#134598 call FmtSelect to update watercan
+FmtSelect(nullptr, false);
+}
}
OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/core/cmdenv.cxx | 21 ++---
ucb/source/core/cmdenv.hxx |3 ---
ucb/source/core/provprox.cxx | 20 +++-
ucb/source/core/provprox.hxx |3 ---
ucb/source/core/ucb.cxx| 14 ++
ucb/source/core/ucb1.component | 20 +---
ucb/source/core/ucbprops.cxx |6 ++
ucb/source/core/ucbstore.cxx | 18 ++
ucb/source/core/ucbstore.hxx |3 ---
9 files changed, 16 insertions(+), 92 deletions(-)
New commits:
commit 5204be412e0e0fc138b82f886b83d5b8e0e77dd2
Author: Stephan Bergmann
AuthorDate: Wed Sep 30 22:21:49 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Oct 1 09:47:05 2020 +0200
Use the new single-instance="true" attribute in ucb
It looks like 3d44c6a49b20415616dab7a2de2820da5efab309 "ucb/core: create
instances with uno constructors" mixed up
com.sun.star.comp.ucb.UcbPropertiesManager (which had originally been
implemented with the single-instance cppu::createOneInstanceFactory) and
com.sun.star.comp.ucb.SimpleFileAccess (which had originally been
implemented
with the multi-instance cppu::createSingleFactory), using a static
g_Instance in the C++ constructor function of the former but adding a fake
to the *.component of the latter.
Change-Id: Ida7cb242a73fbe7689094e239ffe0c0291cf1d3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103738
Tested-by: Jenkins
Reviewed-by: Noel Grandin
Reviewed-by: Stephan Bergmann
diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx
index 66216895bfe5..a768032f228d 100644
--- a/ucb/source/core/cmdenv.cxx
+++ b/ucb/source/core/cmdenv.cxx
@@ -20,8 +20,8 @@
#include
#include
+#include
#include
-#include
#include "cmdenv.hxx"
@@ -33,10 +33,6 @@
using namespace com::sun::star;
using namespace ucb_cmdenv;
-static osl::Mutex g_InstanceGuard;
-static rtl::Reference g_Instance;
-
-
// UcbCommandEnvironment Implementation.
@@ -50,15 +46,6 @@ UcbCommandEnvironment::~UcbCommandEnvironment()
{
}
-// XComponent
-void SAL_CALL UcbCommandEnvironment::dispose()
-{
-UcbCommandEnvironment_Base::dispose();
-osl::MutexGuard aGuard(g_InstanceGuard);
-g_Instance.clear();
-}
-
-
// XInitialization methods.
@@ -124,11 +111,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
ucb_UcbCommandEnvironment_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-osl::MutexGuard aGuard(g_InstanceGuard);
-if (!g_Instance)
-g_Instance.set(new UcbCommandEnvironment());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
UcbCommandEnvironment()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index c11401039f0a..7ed048ff304b 100644
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
@@ -44,9 +44,6 @@ public:
explicit UcbCommandEnvironment();
virtual ~UcbCommandEnvironment() override;
-// XComponent
-virtual void SAL_CALL dispose() override;
-
// XInitialization
virtual void SAL_CALL
initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
override;
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index d0d9cccbe1ef..2352aebf8e9a 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -25,16 +25,13 @@
#include
#include
#include
+#include
#include
-#include
using namespace com::sun::star::lang;
using namespace com::sun::star::ucb;
using namespace com::sun::star::uno;
-static osl::Mutex g_InstanceGuard;
-static rtl::Reference g_Instance;
-
// UcbContentProviderProxyFactory Implementation.
@@ -50,14 +47,6 @@
UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory()
{
}
-// XComponent
-void SAL_CALL UcbContentProviderProxyFactory::dispose()
-{
-UcbContentProviderProxyFactory_Base::dispose();
-osl::MutexGuard aGuard(g_InstanceGuard);
-g_Instance.clear();
-}
-
// XServiceInfo methods.
OUString SAL_CALL UcbContentProviderProxyFactory::getImplementationName()
@@ -80,11 +69,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
ucb_UcbContentProviderProxyFactory_get_implementation(
css::uno::XComponentContext* context , css::uno::Sequence
const&)
{
-osl::MutexGuard aGuard(g_InstanceGuard);
-if (!g_Instance)
-g_Instance.set(new UcbContentProviderProxyFactory(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(
+static_cast(new
UcbContentProviderProxyFactory(context)));
}
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 0e607abafe94..ef08fefebac5 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -48,9 +48,6 @@ public:
const css::un
[Libreoffice-commits] core.git: vcl/vclplug_win.component vcl/win
vcl/vclplug_win.component |5 +
vcl/win/dtrans/WinClipboard.cxx | 28 +---
vcl/win/dtrans/WinClipboard.hxx |2 --
3 files changed, 2 insertions(+), 33 deletions(-)
New commits:
commit d12d236bac476ba39ee41b7d5bc7b849b4fd52c6
Author: Stephan Bergmann
AuthorDate: Wed Sep 30 22:33:33 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Oct 1 09:47:51 2020 +0200
Use the new single-instance="true" attribute in vcl
Change-Id: I6067761fda821b90fdd5c57a2c934c9626e92fdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103739
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/vclplug_win.component b/vcl/vclplug_win.component
index db79a027510e..d6dc9f24e93f 100644
--- a/vcl/vclplug_win.component
+++ b/vcl/vclplug_win.component
@@ -40,10 +40,7 @@
+constructor="dtrans_CWinClipboard_get_implementation"
single-instance="true">
-
-
diff --git a/vcl/win/dtrans/WinClipboard.cxx b/vcl/win/dtrans/WinClipboard.cxx
index 17477fd8d16d..de6ecb775838 100644
--- a/vcl/win/dtrans/WinClipboard.cxx
+++ b/vcl/win/dtrans/WinClipboard.cxx
@@ -19,8 +19,6 @@
#include
-#include
-
#include
#include
#include
@@ -28,7 +26,6 @@
#include
#include
#include
-#include
#include
#include "XNotifyingDataObject.hxx"
@@ -301,27 +298,11 @@ uno::Sequence SAL_CALL
CWinClipboard::getSupportedServiceNames()
return { "com.sun.star.datatransfer.clipboard.SystemClipboard" };
}
-namespace
-{
-std::mutex g_InstanceGuard;
-rtl::Reference g_Instance;
-bool g_Disposed = false;
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
dtrans_CWinClipboard_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence
const&)
{
-std::scoped_lock l(g_InstanceGuard);
-if (g_Disposed)
-{
-return nullptr;
-}
-if (!g_Instance.is())
-{
-g_Instance.set(new CWinClipboard(context, ""));
-}
-return cppu::acquire(static_cast(g_Instance.get()));
+return cppu::acquire(static_cast(new
CWinClipboard(context, "")));
}
void CWinClipboard::onReleaseDataObject(CXNotifyingDataObject* theCaller)
@@ -358,11 +339,4 @@ void WINAPI CWinClipboard::onClipboardContentChanged()
}
}
-void CWinClipboard::disposing()
-{
-std::scoped_lock l(g_InstanceGuard);
-g_Instance.clear();
-g_Disposed = true;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/dtrans/WinClipboard.hxx b/vcl/win/dtrans/WinClipboard.hxx
index 984a07a22dd7..1b0a05a3450d 100644
--- a/vcl/win/dtrans/WinClipboard.hxx
+++ b/vcl/win/dtrans/WinClipboard.hxx
@@ -82,8 +82,6 @@ class CWinClipboard final
static void WINAPI onClipboardContentChanged();
-void SAL_CALL disposing() override;
-
public:
CWinClipboard(const css::uno::Reference&
rxContext,
const OUString& aClipboardName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source dbaccess/util
dbaccess/source/core/dataaccess/databasecontext.cxx | 21 +---
dbaccess/source/core/inc/databasecontext.hxx|3 --
dbaccess/util/dba.component |4 ---
3 files changed, 3 insertions(+), 25 deletions(-)
New commits:
commit 2f1bae744ad473df5de0a5e4882ca4e8b5f20618
Author: Stephan Bergmann
AuthorDate: Wed Sep 30 22:20:12 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Oct 1 09:45:45 2020 +0200
Use the new single-instance="true" attribute in dbaccess
Change-Id: Idd42ae243859ee0a0798568f71460c93981c636f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103736
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 01d83bafa7ee..b57cd9be52db 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -54,6 +54,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -85,10 +86,6 @@ using ::com::sun::star::ucb::InteractiveIOException;
using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING;
using ::com::sun::star::ucb::IOErrorCode_NOT_EXISTING_PATH;
-static osl::Mutex g_InstanceGuard;
-static rtl::Reference g_Instance;
-static bool g_Disposed = false;
-
namespace dbaccess
{
@@ -267,14 +264,6 @@ void ODatabaseContext::disposing()
}
}
-void ODatabaseContext::dispose()
-{
-DatabaseAccessContext_Base::dispose();
-osl::MutexGuard aGuard(g_InstanceGuard);
-g_Instance.clear();
-g_Disposed = true;
-}
-
// XNamingService
Reference< XInterface > ODatabaseContext::getRegisteredObject(const OUString&
_rName)
{
@@ -762,13 +751,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
com_sun_star_comp_dba_ODatabaseContext_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const& )
{
-osl::MutexGuard aGuard(g_InstanceGuard);
-if (g_Disposed)
-return nullptr;
-if (!g_Instance)
-g_Instance.set(new dbaccess::ODatabaseContext(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
dbaccess::ODatabaseContext(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/databasecontext.hxx
b/dbaccess/source/core/inc/databasecontext.hxx
index 8cfa0eb2b6df..4f561ebd2401 100644
--- a/dbaccess/source/core/inc/databasecontext.hxx
+++ b/dbaccess/source/core/inc/databasecontext.hxx
@@ -115,9 +115,6 @@ public:
// OComponentHelper
virtual void SAL_CALL disposing() override;
-// XComponent
-virtual void SAL_CALL dispose() override;
-
// XSingleServiceFactory
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstance( ) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >&
_rArguments ) override;
diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component
index 83795ff82f77..7fcf892bb489 100644
--- a/dbaccess/util/dba.component
+++ b/dbaccess/util/dba.component
@@ -37,9 +37,7 @@
-
-
+constructor="com_sun_star_comp_dba_ODatabaseContext_get_implementation"
single-instance="true">
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysis.component |4 +---
scaddins/source/analysis/analysis.cxx | 22 ++
scaddins/source/analysis/analysis.hxx |3 ---
3 files changed, 3 insertions(+), 26 deletions(-)
New commits:
commit 8e126adb49f47e4b94841c1dcb4628a8c64d597b
Author: Stephan Bergmann
AuthorDate: Wed Sep 30 22:21:05 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Oct 1 09:46:12 2020 +0200
Use the new single-instance="true" attribute in scaddins
Change-Id: I0d45a760276a4855c03c84f5a3a6fbbc98ddf840
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103737
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/scaddins/source/analysis/analysis.component
b/scaddins/source/analysis/analysis.component
index bda78b4e5ab9..86d26c24265f 100644
--- a/scaddins/source/analysis/analysis.component
+++ b/scaddins/source/analysis/analysis.component
@@ -20,10 +20,8 @@
http://openoffice.org/2010/uno-components";>
+constructor="scaddins_AnalysisAddIn_get_implementation"
single-instance="true">
-
-
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index 8b423b86331f..9db4d55fee6f 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -24,10 +24,10 @@
#include
#include
#include
+#include
#include
#include
#include
-#include
#include
#include
#include
@@ -43,10 +43,6 @@ using namespace ::com::sun::star;
using namespace sca::analysis;
using namespace std;
-static osl::Mutex g_InstanceMutex;
-static rtl::Reference g_Instance;
-static bool g_Disposed;
-
OUString AnalysisAddIn::GetFuncDescrStr(const char** pResId, sal_uInt16
nStrIndex)
{
return AnalysisResId(pResId[nStrIndex - 1]);
@@ -72,14 +68,6 @@ AnalysisAddIn::~AnalysisAddIn()
{
}
-void AnalysisAddIn::dispose()
-{
-AnalysisAddIn_Base::dispose();
-osl::MutexGuard aGuard(g_InstanceMutex);
-g_Instance.clear();
-g_Disposed = true;
-}
-
sal_Int32 AnalysisAddIn::getDateMode(
const uno::Reference< beans::XPropertySet >& xPropSet,
const uno::Any& rAny )
@@ -1069,13 +1057,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
scaddins_AnalysisAddIn_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-osl::MutexGuard aGuard(g_InstanceMutex);
-if (g_Disposed)
-return nullptr;
-if (!g_Instance)
-g_Instance.set(new AnalysisAddIn(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
AnalysisAddIn(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/analysis.hxx
b/scaddins/source/analysis/analysis.hxx
index dbfe11a9c2c0..f595134cfd33 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -78,9 +78,6 @@ public:
virtual ~AnalysisAddIn() override;
-// XComponent
-virtual void SAL_CALL dispose() override;
-
/// @throws css::uno::RuntimeException
/// @throws css::lang::IllegalArgumentException
double FactDouble( sal_Int32 nNum );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/manager/mdrivermanager.cxx | 24 +++-
connectivity/source/manager/mdrivermanager.hxx |3 ---
connectivity/source/manager/sdbc2.component|4 +---
3 files changed, 4 insertions(+), 27 deletions(-)
New commits:
commit d9ba652064ee760448d0344d07347480cb195b6e
Author: Stephan Bergmann
AuthorDate: Wed Sep 30 22:19:39 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Oct 1 09:45:22 2020 +0200
Use the new single-instance="true" attribute in connectivity
Change-Id: Ie49207b659214163f2f57051ac8f9de02fab36c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103735
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/source/manager/mdrivermanager.cxx
b/connectivity/source/manager/mdrivermanager.cxx
index 71bcb6c9e816..ae1e226cd2fc 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -29,17 +29,13 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
-static osl::Mutex g_InstanceGuard;
-static rtl::Reference g_Instance;
-static bool g_Disposed = false;
-
namespace drivermanager
{
@@ -259,15 +255,6 @@ OSDBCDriverManager::~OSDBCDriverManager()
{
}
-// XComponent
-void SAL_CALL OSDBCDriverManager::dispose()
-{
-OSDBCDriverManager_Base::dispose();
-osl::MutexGuard aGuard(g_InstanceGuard);
-g_Instance.clear();
-g_Disposed = true;
-}
-
void OSDBCDriverManager::bootstrapDrivers()
{
Reference< XContentEnumerationAccess > xEnumAccess(
m_xContext->getServiceManager(), UNO_QUERY );
@@ -671,13 +658,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
connectivity_OSDBCDriverManager_get_implementation(
css::uno::XComponentContext* context , css::uno::Sequence
const&)
{
-osl::MutexGuard aGuard(g_InstanceGuard);
-if (g_Disposed)
-return nullptr;
-if (!g_Instance)
-g_Instance.set(new drivermanager::OSDBCDriverManager(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(
+static_cast(new
drivermanager::OSDBCDriverManager(context)));
}
diff --git a/connectivity/source/manager/mdrivermanager.hxx
b/connectivity/source/manager/mdrivermanager.hxx
index 20fc0a72df7b..09ccd11e05c3 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -81,9 +81,6 @@ namespace drivermanager
const css::uno::Reference< css::uno::XComponentContext >&
_rxContext );
virtual ~OSDBCDriverManager() override;
-// XComponent
-virtual void SAL_CALL dispose() override;
-
// XDriverManager
virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
getConnection( const OUString& url ) override;
virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
getConnectionWithInfo( const OUString& url, const css::uno::Sequence<
css::beans::PropertyValue >& info ) override;
diff --git a/connectivity/source/manager/sdbc2.component
b/connectivity/source/manager/sdbc2.component
index 8797ec80a27c..b9433256aabf 100644
--- a/connectivity/source/manager/sdbc2.component
+++ b/connectivity/source/manager/sdbc2.component
@@ -20,9 +20,7 @@
http://openoffice.org/2010/uno-components";>
-
-
+constructor="connectivity_OSDBCDriverManager_get_implementation"
single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/servicemanager.cxx | 97 +--
cppuhelper/source/servicemanager.hxx | 19 +-
2 files changed, 88 insertions(+), 28 deletions(-)
New commits:
commit 1a1d432420646bcf129624a866fd6c754e25d195
Author: Stephan Bergmann
AuthorDate: Wed Sep 30 21:31:10 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Oct 1 09:44:53 2020 +0200
Add single-instance attribute for *.compoonent s
...to ease the implementation in C++ code of constructor-based
s
that shall be single-instance (and which would have been implemented with
e.g.
cppu::creaetOneInstanceFactory for non--constructor-based
s).
See e.g. 6e35794cad555485955c3b43593497dcdbf29840 "terminate XDesktop
properly
in unit tests" and 6362ebab298549e8616c32cafd75cb3959ba7d65 "dbaccess:
create
instances with uno constructors" for the clumsy approach used until now,
where
the C++ constructor function uses a static instance that is cleared in
dispose(), adding fake entries to s where
necessary
so that the ServiceManager will call those XComponent::dispose() functions
when
it itself gets disposed.
For every , the ServiceManager already holds an
Implementation
data structure, so it can easily hold a singleInstance there and clear it
when
the ServiceManager gets disposed. (One consequence is that single-instance
implementations are now created with their Instance.mutex locked, but that
should not cause problems in practice, given that the construction of a
single-
instance implementation should not recursively request its own construction
anyway.)
The new single-instance="true" attribute is mostly useful in combination
with
the constructor attribute (see above), but it can also be used for non--
constructor-based s, at least in theory.
(The single-instance="true" attribute is orthogonal to elements.
There are existing single-instance services---even if those should arguably
have
been defined as singletons in the first place---that can benefit from
single-instance="true". And there are s that support one or
more s alongside one or more s, where the latter are not
single-instance.)
This new single-instance="true" attribute in *.component files should not
interfere with the lo_get_constructor_map machinery in the
DISABLE_DYNLOADING
branch of cppuhelper::detail::loadSharedLibComponentFactory
(cppuhelper/source/shlib.cxx) used by Android, iOS and some fuzzer code.
AFAIU, the lo_get_constructor_map machinery should only ever come into play
after the ServiceManager has decided whether or not to create a new instance
based on the single-instance attributes in the *.component files.
This commit only provides the new single-instance="true" attribute. Actual
changes of s and their C++ constructor functions are
delegated
to a series of follow-up commits. (So that they can easily be reverted
individually should the need arise.)
Change-Id: Iea6c0fc539d74477b7a536dc771b198df6b0510e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103734
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index f06405f7794b..fe9ef7dbd2b4 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -327,6 +327,7 @@ void Parser::handleComponent() {
void Parser::handleImplementation() {
OUString attrName;
OUString attrConstructor;
+bool attrSingleInstance = false;
xmlreader::Span name;
int nsId;
while (reader_.nextAttribute(&nsId, &name)) {
@@ -366,6 +367,19 @@ void Parser::handleImplementation() {
+ ": has \"constructor\" attribute but"
" has no \"environment\" attribute");
}
+} else if (nsId == xmlreader::XmlReader::NAMESPACE_NONE
+ &&
name.equals(RTL_CONSTASCII_STRINGPARAM("single-instance")))
+{
+if (attrSingleInstance) {
+throw css::registry::InvalidRegistryException(
+reader_.getUrl()
++ ": has multiple \"single-instance\"
attributes");
+}
+if
(!reader_.getAttributeValue(false).equals(RTL_CONSTASCII_STRINGPARAM("true"))) {
+throw css::registry::InvalidRegistryException(
+reader_.getUrl() + ": has bad
\"single-instance\" attribute");
+}
+attrSingleInstance = true;
} else {
throw css::registry::InvalidRegistryException(
reader_.getUrl() + ": unexpected element attribute \""
@@ -380,7 +394,7 @@ void Parser::handleImplementation() {
implementation_ =
std::make_shared(
attrName, attrLoader_, attrUri_, attrEnvironment_, attrConstructor,
-attrPref
[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_skia.mk vcl/inc vcl/Module_vcl.mk vcl/qa
vcl/CppunitTest_vcl_skia.mk | 51 ++
vcl/Module_vcl.mk|2 +
vcl/inc/skia/salbmp.hxx |6 +++
vcl/qa/cppunit/skia/skia.cxx | 71 +++
4 files changed, 130 insertions(+)
New commits:
commit 9c850ca827486db3702699e5c2218842d7361b1b
Author: Luboš Luňák
AuthorDate: Wed Sep 30 14:09:55 2020 +0200
Commit: Luboš Luňák
CommitDate: Thu Oct 1 09:42:52 2020 +0200
add CppunitTest_vcl_skia to do Skia-specific tests
Change-Id: I7b5c1637aaf0fc070391f08800cd44308b4db0b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103710
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/CppunitTest_vcl_skia.mk b/vcl/CppunitTest_vcl_skia.mk
new file mode 100644
index ..094bba75fafa
--- /dev/null
+++ b/vcl/CppunitTest_vcl_skia.mk
@@ -0,0 +1,51 @@
+# -*- 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,vcl_skia))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_skia, \
+ vcl/qa/cppunit/skia/skia \
+))
+
+$(eval $(call gb_CppunitTest_set_include,vcl_skia,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_skia, \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ subsequenttest \
+ test \
+ tl \
+ unotest \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,vcl_skia, \
+ boost_headers \
+ $(if $(filter SKIA,$(BUILD_TYPE)),skia) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_skia))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_skia))
+$(eval $(call gb_CppunitTest_use_vcl_non_headless,vcl_skia))
+
+$(eval $(call gb_CppunitTest_use_rdb,vcl_skia,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_skia))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 0e7bb1600b0a..436877015d47 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -209,6 +209,8 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_type_serializer_test \
$(call gb_Helper_optional, PDFIUM, \
CppunitTest_vcl_pdfium_library_test) \
+$(if $(filter SKIA,$(BUILD_TYPE)), \
+CppunitTest_vcl_skia) \
))
ifeq ($(USING_X11),TRUE)
diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index 0f1a8b235164..00cd76ffd10e 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -86,6 +86,12 @@ public:
void dump(const char* file) const;
#endif
+// These are to be used only by unittests.
+bool unittestHasBuffer() const { return mBuffer.get(); }
+bool unittestHasImage() const { return mImage.get(); }
+bool unittestHasAlphaImage() const { return mAlphaImage.get(); }
+bool unittestHasEraseColor() const { return mEraseColorSet; }
+
private:
// Reset the cached images allocated in GetSkImage()/GetAlphaSkImage().
void ResetCachedData();
diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx
new file mode 100644
index ..07f5a872ddbb
--- /dev/null
+++ b/vcl/qa/cppunit/skia/skia.cxx
@@ -0,0 +1,71 @@
+/* -*- 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
+
+// This tests backends that use Skia (i.e. intentionally not the svp one,
which is the default.)
+// Note that you still may need to actually set for Skia to be used (see
vcl/README.vars).
+// If Skia is not enabled, all tests will be silently skipped.
+namespace
+{
+class SkiaTest : public test::BootstrapFixture
+{
+public:
+SkiaTest()
+: test::BootstrapFixture(true, false)
+{
+}
+
+void testBitmapErase();
+
+CPPUNIT_TEST_SUITE(SkiaTest);
+CPPUNIT_TEST(testBitmapErase);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void SkiaTest::testBitmapErase()
+{
+if (!SkiaHelper::isVCLSkiaEnabled())
+return;
+Bitmap bitmap(Size(10, 10), 24);
+SkiaSalBitmap* skiaBitmap =
dynamic_cast(bitmap.ImplGetSalBitmap().get());
+CPPUNIT_ASSERT(skiaBitmap);
+// Uninitialized bitmap.
+CPPUNIT_ASSERT(!skiaBitmap->unittestHasBuffer());
+CPPUNIT_ASSERT(!skiaBitmap->unittestHasImage());
+CPPUNIT_ASSERT(!s
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - 13 commits - download.lst external/expat external/libxml2 include/o3tl Makefile.fetch shell/source
Rebased ref, commits from common ancestor:
commit 85acf7b47e9e76222e4e8a5028a312237b1561fd
Author: Stephan Bergmann
AuthorDate: Wed Jan 15 17:16:02 2020 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 09:10:24 2020 +0200
Remove a fragment from a file URL early on
...as ShellExecuteExW would ignore it anyway
Change-Id: I969db094bb7d2ea230ac8c36eb23d71a90fbe466
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86868
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 14b36a16b225bf7c988f118d499a7287c47cd83e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86877
Reviewed-by: Mike Kaganski
(cherry picked from commit 51da0d22ff42b20ab38130b7874651ef136ecceb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88208
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 374ddad1a691..6f3b0d578323 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -296,6 +296,7 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
static_cast< XSystemShellExecute* >( this ),
3 );
+OUString preprocessed_command(aCommand);
if ((nFlags & URIS_ONLY) != 0)
{
css::uno::Reference< css::uri::XUriReference > uri(
@@ -310,8 +311,10 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
static_cast< cppu::OWeakObject * >(this), 0);
}
if (uri->getScheme().equalsIgnoreAsciiCase("file")) {
+// ShellExecuteExW appears to ignore the fragment of a file URL
anyway, so remove it:
+uri->clearFragment();
+preprocessed_command = uri->getUriReference();
OUString pathname;
-uri->clearFragment(); // getSystemPathFromFileURL fails for URLs
with fragment
auto const e1
=
osl::FileBase::getSystemPathFromFileURL(uri->getUriReference(), pathname);
if (e1 != osl::FileBase::E_None) {
@@ -415,7 +418,6 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
and names no existing file (remember the jump mark
sign '#' is a valid file name character we remove
the jump mark, else ShellExecuteEx fails */
-OUString preprocessed_command(aCommand);
if (is_system_path(preprocessed_command))
{
if (has_jump_mark(preprocessed_command) &&
!is_existing_file(preprocessed_command))
commit e2c7565592eccfd97f42d08cfcd36bb5969d0794
Author: Mike Kaganski
AuthorDate: Thu Aug 1 10:52:12 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 09:10:24 2020 +0200
tdf#126641: don't fail on file URLs with fragment
This only fixes part that the URL refuses to open the target file.
Honoring fragment isn't fixed here, since it's the system call to
ShellExecuteExW that in this case internally converts the file URL
into a system path, and strips the fragment from it.
Regression from commit d59ec4cd1660410fa1b18c50d2d83b1417a82ddc.
Change-Id: I6c9ed27e9a5bd7f2780dd3be96f816a6e825e043
Reviewed-on: https://gerrit.libreoffice.org/76778
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 2207269a84c7c9920af3385b837ce67978c720b4)
Reviewed-on: https://gerrit.libreoffice.org/76848
Reviewed-by: Stephan Bergmann
(cherry picked from commit dd2b7919058fc0e23a7117d39110d3ecaaad1fb2)
Reviewed-on: https://gerrit.libreoffice.org/76881
Reviewed-by: Michael Stahl
(cherry picked from commit 72861eaf7cf9af3e7764b13d9e74edc5548806d2)
Reviewed-on: https://gerrit.libreoffice.org/77095
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 83efeb0001bd..374ddad1a691 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -311,7 +311,9 @@ void SAL_CALL CSysShExec::execute( const OUString&
aCommand, const OUString& aPa
}
if (uri->getScheme().equalsIgnoreAsciiCase("file")) {
OUString pathname;
-auto const e1 = osl::FileBase::getSystemPathFromFileURL(aCommand,
pathname);
+uri->clearFragment(); // getSystemPathFromFileURL fails for URLs
with fragment
+auto const e1
+=
osl::FileBase::getSystemPathFromFileURL(uri->getUriReference(), pathname);
if (e1 != osl::FileBase::E_None) {
throw css::lang::IllegalArgumentException(
("XSystemShellExecute.execute, getSystemPathFromFileURL <"
+ aCommand
commit 5b37da790a4cc5bdf4eb2ed3eed9753c4b665c90
Author: Stephan Bergmann
AuthorDate: Fri Mar 29 14:01:19 2019 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Oct 1 09:10:23 2020 +020
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/filter/ipdf/ipdf.cxx | 16 ++-- 1 file changed, 6 insertions(+), 10 deletions(-) New commits: commit 4722a7b376946a0540f7dd95cdbacf8a0507860d Author: Miklos Vajna AuthorDate: Wed Sep 30 21:02:44 2020 +0200 Commit: Miklos Vajna CommitDate: Thu Oct 1 09:09:11 2020 +0200 CppunitTest_vcl_filter_ipdf: use vcl::pdf::PDFiumDocument Instead of the upstream scopers, to standardize on a single set of pdfium wrappers. Change-Id: I50c0301629f8b09286d43063ad11b4d70a50c4c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103732 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx index 5d44cf9bbef2..96fd331ceb76 100644 --- a/vcl/qa/cppunit/filter/ipdf/ipdf.cxx +++ b/vcl/qa/cppunit/filter/ipdf/ipdf.cxx @@ -10,10 +10,6 @@ #include #include -#include -#include -#include - #include #include #include @@ -132,16 +128,16 @@ CPPUNIT_TEST_FIXTURE(VclFilterIpdfTest, testPDFAddVisibleSignatureLastPage) SvMemoryStream aMemory; aMemory.WriteStream(aFile); // Last page. -ScopedFPDFDocument pPdfDocument( -FPDF_LoadMemDocument(aMemory.GetData(), aMemory.GetSize(), /*password=*/nullptr)); -ScopedFPDFPage pPdfPage(FPDF_LoadPage(pPdfDocument.get(), /*page_index=*/1)); +std::unique_ptr pPdfDocument += pPDFium->openDocument(aMemory.GetData(), aMemory.GetSize()); +std::unique_ptr pPdfPage = pPdfDocument->openPage(/*nIndex=*/1); // Without the accompanying fix in place, this test would have failed with: // - Expected: 1 // - Actual : 0 // i.e. the signature was there, but it was on the first page. -CPPUNIT_ASSERT_EQUAL(1, FPDFPage_GetAnnotCount(pPdfPage.get())); -ScopedFPDFAnnotation pAnnot(FPDFPage_GetAnnot(pPdfPage.get(), 0)); -CPPUNIT_ASSERT_EQUAL(4, FPDFAnnot_GetObjectCount(pAnnot.get())); +CPPUNIT_ASSERT_EQUAL(1, pPdfPage->getAnnotationCount()); +std::unique_ptr pAnnot = pPdfPage->getAnnotation(0); +CPPUNIT_ASSERT_EQUAL(4, pAnnot->getObjectCount()); } CPPUNIT_PLUGIN_IMPLEMENT(); ___ 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 e8aa9daffe628b401058b1e37d2a8839e9f7dd5d Author: Travis Stewart AuthorDate: Thu Oct 1 09:07:47 2020 +0200 Commit: Gerrit Code Review CommitDate: Thu Oct 1 09:07:47 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to a9deae83c3b11cdb138069b97f3cd6111ff6a19f - Fix spelling from UK English to US English Change-Id: I5b1f9a65581945e8ec79f83728175d36f38a63eb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103662 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/helpcontent2 b/helpcontent2 index b16f95724b69..a9deae83c3b1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b16f95724b69db8bd3327c36c26dd556d81c9c46 +Subproject commit a9deae83c3b11cdb138069b97f3cd6111ff6a19f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/layout.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 10bda37a3c6470a46dadd859daa60a67ab53c29f Author: Thorsten Behrens AuthorDate: Wed Sep 30 17:42:41 2020 +0200 Commit: Thorsten Behrens CommitDate: Thu Oct 1 09:07:12 2020 +0200 vcl: remove duplicate forward Change-Id: Id6021cae4bbde8e420ee82e311f4221e49199ef9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103716 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 3a5adbcf0aeb..519d9bf8688b 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -24,7 +24,6 @@ #include #include -class ScrollBar; class ScrollBar; class ScrollBarBox; class Splitter; ___ 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/sbasic/python/python_listener.xhp |2 +- source/text/sbasic/shared/compatibilitymode.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a9deae83c3b11cdb138069b97f3cd6111ff6a19f Author: Travis Stewart AuthorDate: Thu Oct 1 02:28:24 2020 +0200 Commit: Thorsten Behrens CommitDate: Thu Oct 1 09:07:47 2020 +0200 Fix spelling from UK English to US English Change-Id: I5b1f9a65581945e8ec79f83728175d36f38a63eb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103662 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/source/text/sbasic/python/python_listener.xhp b/source/text/sbasic/python/python_listener.xhp index c6cdd39f5..6cffde6a6 100644 --- a/source/text/sbasic/python/python_listener.xhp +++ b/source/text/sbasic/python/python_listener.xhp @@ -29,7 +29,7 @@ Creating Event Listeners Events raised by dialogs, documents, forms or graphical controls can be linked to macros, which is referred to as event-driven programming. The most common method to relate events to macros are the Events tab in Tools – Customize menu and the Dialog Editor Control properties pane from Tools - Macros – Organise Dialogs... menu. - Graphical artifacts, keyboard inputs, mouse moves and other man/machine interactions can be controlled using UNO listeners that watch for the user’s behaviour. Listeners are dynamic program code alternatives to macro assignments. One may create as many UNO listeners as events to watch for. A single listener can also handle multiple user interface controls. + Graphical artifacts, keyboard inputs, mouse moves and other man/machine interactions can be controlled using UNO listeners that watch for the user’s behavior. Listeners are dynamic program code alternatives to macro assignments. One may create as many UNO listeners as events to watch for. A single listener can also handle multiple user interface controls. Creating an event listener Listeners get attached to controls held in dialogs, as well as to document or form events. Listeners are also used when creating runtime dialogs or when adding controls to a dialog on the fly. This example creates a listener for Button1 control of Dialog1 dialog in Standard library. diff --git a/source/text/sbasic/shared/compatibilitymode.xhp b/source/text/sbasic/shared/compatibilitymode.xhp index 6340361b9..ef2ac443b 100644 --- a/source/text/sbasic/shared/compatibilitymode.xhp +++ b/source/text/sbasic/shared/compatibilitymode.xhp @@ -29,7 +29,7 @@ Creating enumerations with Enum statement Running RmDir command in VBA mode. In VBA only empty directories are removed by RmDir while %PRODUCTNAME Basic removes a directory recursively. -Changing behaviour of Basic Dir command. The directory flag (16) for the Dir command means that only directories are returned in %PRODUCTNAME Basic, while in VBA normal files and directories are returned. +Changing behavior of Basic Dir command. The directory flag (16) for the Dir command means that only directories are returned in %PRODUCTNAME Basic, while in VBA normal files and directories are returned. CompatibilityMode() function may be necessary when resorting to Option Compatible or Option VBASupport compiler modes. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
