[Libreoffice-commits] core.git: include/sfx2

2020-12-24 Thread Seth Chaiklin (via logerrit) 
 include/sfx2/strings.hrc |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c66aa585c4b235fa8305fe313c46710013b8abe8
Author: Seth Chaiklin 
AuthorDate: Tue Dec 22 14:25:33 2020 +0100
Commit: Seth Chaiklin 
CommitDate: Thu Dec 24 09:14:34 2020 +0100

tdf#138893  improve labels on rename "template" and "category" dialogs

Change-Id: Iaf890a78ea89ef212afb9b30ffc62f5a9056541d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108174
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 09ddd5e6c415..3cccba74c372 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -34,7 +34,7 @@
 #define STR_DELETE  NC_("STR_DELETE", "Delete")
 #define STR_SFX_RENAME  NC_("STR_SFX_RENAME", "Rename")
 #define STR_CATEGORY_RENAME NC_("STR_CATEGORY_RENAME", 
"Rename Category")
-#define STR_RENAME_TEMPLATE NC_("STR_RENAME_TEMPLATE", 
"Enter New Name: ")
+#define STR_RENAME_TEMPLATE NC_("STR_RENAME_TEMPLATE", 
"Enter new template name:")
 #define STR_TEMPLATE_TOOLTIPNC_("STR_TEMPLATE_TOOLTIP", 
"Title: $1\nCategory: $2")
 #define STR_TEMPLATE_SELECTION  NC_("STR_TEMPLATE_SELECTION", 
"Select a Template")
 #define STR_AUTOMATICVERSIONNC_("STR_AUTOMATICVERSION", 
"Automatically saved version")
@@ -64,7 +64,7 @@
 #define STR_MSG_QUERY_COPY  NC_("STR_MSG_QUERY_COPY", "$1 
could not be moved to the category \"$2\". Do you want to copy the template 
instead?")
 #define STR_CREATE_ERRORNC_("STR_CREATE_ERROR", 
"Cannot create category: $1")
 #define STR_ERROR_SAVEASNC_("STR_ERROR_SAVEAS", 
"Cannot save template: $1")
-#define STR_INPUT_NEW   NC_("STR_INPUT_NEW", "Enter 
category name:")
+#define STR_INPUT_NEW   NC_("STR_INPUT_NEW", "Enter 
new category name:")
 #define STR_MSG_ERROR_LOCAL_MOVE
NC_("STR_MSG_ERROR_LOCAL_MOVE", "Error moving the following templates to 
$1.\n$2")
 #define STR_MSG_ERROR_EXPORTNC_("STR_MSG_ERROR_EXPORT", 
"Error exporting the following templates:\n$1")
 #define STR_MSG_ERROR_IMPORTNC_("STR_MSG_ERROR_IMPORT", 
"Error importing the following templates to $1:\n$2")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

2020-12-24 Thread Bayram Çiçek (via logerrit) 
 sw/source/core/inc/unobookmark.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 6a905223b6caefeace9c5037974462e0b94546f4
Author: Bayram Çiçek 
AuthorDate: Mon Nov 23 19:17:44 2020 +
Commit: Julien Nabet 
CommitDate: Thu Dec 24 09:27:40 2020 +0100

tdf#124176: Use pragma once instead of include guards

Change-Id: I49acd246a9675a0749e056178dec43d0d73c488e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106450
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sw/source/core/inc/unobookmark.hxx 
b/sw/source/core/inc/unobookmark.hxx
index 8ebbc373008f..05de670cff09 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
+#pragma once
 
 #include 
 #include 
@@ -241,6 +240,4 @@ public:
 
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format vcl/Library_vcl.mk vcl/source

2020-12-24 Thread Chris Sherlock (via logerrit) 
 solenv/clang-format/excludelist |   19 ++-
 vcl/Library_vcl.mk  |   18 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 3cf6b8b33036a9994bcbb09b006ff9ca574dfaa8
Author: Chris Sherlock 
AuthorDate: Sat Dec 19 00:32:40 2020 +1100
Commit: Tomaž Vajngerl 
CommitDate: Thu Dec 24 09:28:20 2020 +0100

vcl: move bitmap files from gdi directory to bitmap directory

Change-Id: I9358e2b0fe030d561da6df831c951328b09eab39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108037
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 292d5abce166..8fed24e6b933 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14895,8 +14895,18 @@ vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx
 vcl/source/bitmap/BitmapSymmetryCheck.cxx
 vcl/source/bitmap/BitmapTools.cxx
+vcl/source/bitmap/alpha.cxx
 vcl/source/bitmap/bitmap.cxx
+vcl/source/bitmap/bitmap3.cxx
+vcl/source/bitmap/BitmapEx.cxx
+vcl/source/bitmap/bmpacc.cxx
+vcl/source/bitmap/bmpacc2.cxx
+vcl/source/bitmap/bmpfast.cxx
 vcl/source/bitmap/checksum.cxx
+vcl/source/bitmap/dibtools.cxx
+vcl/source/bitmap/floyd.hxx
+vcl/source/bitmap/impvect.cxx
+vcl/source/bitmap/impvect.hxx
 vcl/source/bitmap/salbmp.cxx
 vcl/source/cnttype/mcnttfactory.cxx
 vcl/source/cnttype/mcnttfactory.hxx
@@ -15002,17 +15012,9 @@ vcl/source/fontsubset/ttcr.hxx
 vcl/source/fontsubset/xlat.cxx
 vcl/source/gdi/CommonSalLayout.cxx
 vcl/source/gdi/VerticalOrientationData.cxx
-vcl/source/gdi/alpha.cxx
-vcl/source/gdi/bitmap3.cxx
-vcl/source/gdi/bitmapex.cxx
-vcl/source/gdi/bmpacc.cxx
-vcl/source/gdi/bmpacc2.cxx
-vcl/source/gdi/bmpfast.cxx
 vcl/source/gdi/configsettings.cxx
 vcl/source/gdi/cvtgrf.cxx
-vcl/source/gdi/dibtools.cxx
 vcl/source/gdi/embeddedfontshelper.cxx
-vcl/source/gdi/floyd.hxx
 vcl/source/gdi/gdimetafiletools.cxx
 vcl/source/gdi/gdimtf.cxx
 vcl/source/gdi/gfxlink.cxx
@@ -15022,7 +15024,6 @@ vcl/source/gdi/graphictools.cxx
 vcl/source/gdi/hatch.cxx
 vcl/source/gdi/impanmvw.cxx
 vcl/source/gdi/impgraph.cxx
-vcl/source/gdi/impvect.cxx
 vcl/source/gdi/impvect.hxx
 vcl/source/gdi/jobset.cxx
 vcl/source/gdi/lineinfo.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ff8c4182af2f..9ac604a3d1d3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -267,17 +267,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/treelist/svimpbox \
 vcl/source/treelist/svlbitm \
 vcl/source/treelist/uiobject \
-vcl/source/gdi/alpha \
-vcl/source/gdi/bitmap3 \
-vcl/source/gdi/bitmapex \
-vcl/source/gdi/bmpacc2 \
-vcl/source/gdi/bmpacc3 \
-vcl/source/gdi/bmpacc \
-vcl/source/gdi/bmpfast \
 vcl/source/gdi/configsettings \
 vcl/source/gdi/cvtgrf \
 vcl/source/gdi/svmconverter \
-vcl/source/gdi/dibtools \
 vcl/source/gdi/embeddedfontshelper \
 vcl/source/gdi/FileDefinitionWidgetDraw \
 vcl/source/gdi/WidgetDefinitionReader \
@@ -294,7 +286,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/impanmvw \
 vcl/source/gdi/impglyphitem \
 vcl/source/gdi/impgraph \
-vcl/source/gdi/impvect \
 vcl/source/gdi/jobset \
 vcl/source/gdi/lineinfo \
 vcl/source/gdi/mapmod \
@@ -343,7 +334,16 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/graphic/UnoGraphicProvider \
 vcl/source/graphic/UnoGraphicTransformer \
 vcl/source/graphic/VectorGraphicSearch \
+vcl/source/bitmap/impvect \
 vcl/source/bitmap/bitmap \
+vcl/source/bitmap/bitmap3 \
+vcl/source/bitmap/BitmapEx \
+vcl/source/bitmap/alpha \
+vcl/source/bitmap/dibtools \
+vcl/source/bitmap/bmpacc2 \
+vcl/source/bitmap/bmpacc3 \
+vcl/source/bitmap/bmpacc \
+vcl/source/bitmap/bmpfast \
 vcl/source/bitmap/bitmapfilter \
 vcl/source/bitmap/BitmapAlphaClampFilter \
 vcl/source/bitmap/BitmapBasicMorphologyFilter \
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/bitmap/BitmapEx.cxx
similarity index 100%
rename from vcl/source/gdi/bitmapex.cxx
rename to vcl/source/bitmap/BitmapEx.cxx
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/bitmap/alpha.cxx
similarity index 100%
rename from vcl/source/gdi/alpha.cxx
rename to vcl/source/bitmap/alpha.cxx
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/bitmap/bitmap3.cxx
similarity index 100%
rename from vcl/source/gdi/bitmap3.cxx
rename to vcl/source/bitmap/bitmap3.cxx
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/bitmap/bmpacc.cxx
similarity index 100%
rename from vcl/source/gdi/bmpacc.cxx
rename to vcl/source/bitmap/bmpacc.cxx
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/bitmap/bmpacc2.cxx
similarity index 100%
rename from vcl/source/gdi/bmpacc2.cxx
rename to vcl/source/bitmap/bmpacc2.cxx
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/s

[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/Library_vcl.mk vcl/source

2020-12-24 Thread Chris Sherlock (via logerrit) 
 include/vcl/bitmap.hxx  |2 
 solenv/clang-format/excludelist |1 
 vcl/Library_vcl.mk  |1 
 vcl/source/bitmap/bitmap.cxx|  893 +++
 vcl/source/bitmap/bitmap3.cxx   | 1009 
 vcl/source/bitmap/floyd.hxx |   68 ++
 6 files changed, 963 insertions(+), 1011 deletions(-)

New commits:
commit d117d402853ee6c103142f0d0ccdb7cd4b8b8d05
Author: Chris Sherlock 
AuthorDate: Sat Dec 19 00:53:33 2020 +1100
Commit: Tomaž Vajngerl 
CommitDate: Thu Dec 24 09:33:12 2020 +0100

vcl: merge bitmap.cxx and bitmap3.cxx

Change-Id: I0bc9cf6d72e15ed9b47c353a3350c6ebd2e8376f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108038
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index ef27679bc9fc..d9d6c81d7661 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -27,7 +27,9 @@
 #include 
 #include 
 #include 
+
 #include 
+
 #include 
 
 #define GAMMA( _def_cVal, _def_InvGamma )   
(static_cast(MinMax(FRound(pow( 
_def_cVal/255.0,_def_InvGamma)*255.0),0,255)))
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 8fed24e6b933..8083ab7d7b6e 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14897,7 +14897,6 @@ vcl/source/bitmap/BitmapSymmetryCheck.cxx
 vcl/source/bitmap/BitmapTools.cxx
 vcl/source/bitmap/alpha.cxx
 vcl/source/bitmap/bitmap.cxx
-vcl/source/bitmap/bitmap3.cxx
 vcl/source/bitmap/BitmapEx.cxx
 vcl/source/bitmap/bmpacc.cxx
 vcl/source/bitmap/bmpacc2.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9ac604a3d1d3..4667f5794cc5 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -336,7 +336,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/graphic/VectorGraphicSearch \
 vcl/source/bitmap/impvect \
 vcl/source/bitmap/bitmap \
-vcl/source/bitmap/bitmap3 \
 vcl/source/bitmap/BitmapEx \
 vcl/source/bitmap/alpha \
 vcl/source/bitmap/dibtools \
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index c7b7b9b7e70c..5c37b3b8269c 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -17,9 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
 #include 
 #include 
+
 #include 
+#include 
 #include 
 #include 
 
@@ -27,7 +32,26 @@
 #include 
 #include 
 #include 
+#if HAVE_FEATURE_SKIA
+#include 
+#endif
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "impvect.hxx"
+#include "floyd.hxx"
 
+#include 
 #include 
 #include 
 
@@ -921,4 +945,873 @@ bool Bitmap::GetSystemData( BitmapSystemData& rData ) 
const
 return mxSalBmp && mxSalBmp->GetSystemData(rData);
 }
 
+
+bool Bitmap::Convert( BmpConversion eConversion )
+{
+// try to convert in backend
+if (mxSalBmp)
+{
+// avoid large chunk of obsolete and hopefully rarely used conversions.
+if (eConversion == BmpConversion::N8BitNoConversion)
+{
+std::shared_ptr 
xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap());
+// frequently used conversion for creating alpha masks
+if (xImpBmp->Create(*mxSalBmp) && xImpBmp->InterpretAs8Bit())
+{
+ImplSetSalBitmap(xImpBmp);
+SAL_INFO( "vcl.opengl", "Ref count: " << mxSalBmp.use_count() 
);
+return true;
+}
+}
+if (eConversion == BmpConversion::N8BitGreys)
+{
+std::shared_ptr 
xImpBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap());
+if (xImpBmp->Create(*mxSalBmp) && xImpBmp->ConvertToGreyscale())
+{
+ImplSetSalBitmap(xImpBmp);
+SAL_INFO( "vcl.opengl", "Ref count: " << mxSalBmp.use_count() 
);
+return true;
+}
+}
+}
+
+const sal_uInt16 nBitCount = GetBitCount ();
+bool bRet = false;
+
+switch( eConversion )
+{
+case BmpConversion::N1BitThreshold:
+{
+BitmapEx aBmpEx(*this);
+bRet = BitmapFilter::Filter(aBmpEx, BitmapMonochromeFilter(128));
+*this = aBmpEx.GetBitmap();
+}
+break;
+
+case BmpConversion::N4BitGreys:
+bRet = ImplMakeGreyscales( 16 );
+break;
+
+case BmpConversion::N4BitColors:
+{
+if( nBitCount < 4 )
+bRet = ImplConvertUp( 4 );
+else if( nBitCount > 4 )
+bRet = ImplConvertDown( 4 );
+else
+bRet = true;
+}
+break;
+
+case BmpConversion::N8BitGreys:
+case BmpConversion::N8BitNoConversion:
+bRet = ImplMakeGreyscales( 256 );
+break;
+
+case BmpConversion::N8BitColo

[Libreoffice-commits] core.git: canvas/inc canvas/source drawinglayer/source emfio/qa emfio/source filter/source forms/source include/vcl sc/source sd/qa sd/source solenv/clang-format svx/source sw/qa

2020-12-24 Thread Chris Sherlock (via logerrit) 
 canvas/inc/pch/precompiled_vclcanvas.hxx  |5 
 canvas/source/directx/dx_vcltools.cxx |2 
 canvas/source/vcl/canvashelper.cxx|2 
 drawinglayer/source/texture/texture3d.cxx |2 
 emfio/qa/cppunit/emf/EmfImportTest.cxx|2 
 emfio/source/reader/wmfreader.cxx |2 
 filter/source/graphicfilter/egif/egif.cxx |2 
 filter/source/graphicfilter/eps/eps.cxx   |2 
 filter/source/graphicfilter/etiff/etiff.cxx   |2 
 filter/source/msfilter/msdffimp.cxx   |2 
 filter/source/msfilter/svdfppt.cxx|2 
 forms/source/component/imgprod.cxx|2 
 include/vcl/BitmapInfoAccess.hxx  |  144 +++
 include/vcl/BitmapReadAccess.hxx  |  190 
 include/vcl/bitmapaccess.hxx  |  283 --
 sc/source/filter/excel/xeescher.cxx   |2 
 sd/qa/unit/import-tests.cxx   |2 
 sd/source/ui/dlg/vectdlg.cxx  |2 
 solenv/clang-format/excludelist   |2 
 svx/source/svdraw/svdetc.cxx  |2 
 sw/qa/extras/tiledrendering/tiledrendering.cxx|2 
 vcl/Library_vcl.mk|6 
 vcl/backendtest/outputdevice/line.cxx |2 
 vcl/inc/BitmapSymmetryCheck.hxx   |3 
 vcl/inc/bitmapwriteaccess.hxx |2 
 vcl/inc/pch/precompiled_vcl.hxx   |6 
 vcl/qa/cppunit/BitmapFilterTest.cxx   |1 
 vcl/qa/cppunit/BitmapProcessorTest.cxx|1 
 vcl/qa/cppunit/BitmapScaleTest.cxx|1 
 vcl/qa/cppunit/BitmapTest.cxx |1 
 vcl/qa/cppunit/GraphicTest.cxx|2 
 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx  |2 
 vcl/qa/cppunit/canvasbitmaptest.cxx   |1 
 vcl/qa/cppunit/jpeg/JpegWriterTest.cxx|2 
 vcl/qa/cppunit/outdev.cxx |1 
 vcl/qa/cppunit/png/PngFilterTest.cxx  |2 
 vcl/skia/salbmp.cxx   |2 
 vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx |1 
 vcl/source/bitmap/BitmapColorQuantizationFilter.cxx   |1 
 vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx   |1 
 vcl/source/bitmap/BitmapDisabledImageFilter.cxx   |2 
 vcl/source/bitmap/BitmapDuoToneFilter.cxx |1 
 vcl/source/bitmap/BitmapEmbossGreyFilter.cxx  |1 
 vcl/source/bitmap/BitmapEx.cxx|1 
 vcl/source/bitmap/BitmapFastScaleFilter.cxx   |1 
 vcl/source/bitmap/BitmapFilterStackBlur.cxx   |1 
 vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx   |1 
 vcl/source/bitmap/BitmapInfoAccess.cxx|   78 +
 vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx|1 
 vcl/source/bitmap/BitmapLightenFilter.cxx |2 
 vcl/source/bitmap/BitmapMedianFilter.cxx  |1 
 vcl/source/bitmap/BitmapMonochromeFilter.cxx  |1 
 vcl/source/bitmap/BitmapMosaicFilter.cxx  |1 
 vcl/source/bitmap/BitmapReadAccess.cxx|  609 ++
 vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx|2 
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx  |1 
 vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx  |1 
 vcl/source/bitmap/BitmapSepiaFilter.cxx   |1 
 vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx |1 
 vcl/source/bitmap/BitmapSobelGreyFilter.cxx   |1 
 vcl/source/bitmap/BitmapSymmetryCheck.cxx |2 
 vcl/source/bitmap/BitmapTools.cxx |1 
 vcl/source/bitmap/BitmapWriteAccess.cxx   |  132 ++-
 vcl/source/bitmap/Octree.cxx  |2 
 vcl/source/bitmap/alpha.cxx   |1 
 vcl/source/bitmap/bitmap.cxx  |1 
 vcl/source/bitmap/bitmappaint.cxx |1 
 vcl/source/bitmap/bmpacc.cxx  |  433 -
 vcl/source/bitmap/bmpacc2.cxx |  349 
 vcl/source/bitmap/bmpfast.cxx |1 
 vcl/source/bitmap/dibtools.cxx|1 
 vcl/source/bitmap/impvect.cxx |2 
 vcl/source/filter/jpeg/JpegWriter.cxx |2 
 vcl/source/filter/jpeg/JpegWriter.hxx |

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - xmlsecurity/qa

2020-12-24 Thread Vasily Melenchuk (via logerrit) 
 xmlsecurity/qa/unit/signing/signing2.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit fb309ea661e19ded97f92ad59c6b98b32e8271f8
Author: Vasily Melenchuk 
AuthorDate: Thu Dec 24 13:06:17 2020 +0300
Commit: Vasily Melenchuk 
CommitDate: Thu Dec 24 13:09:57 2020 +0300

macro signature preservation testcase fixed for LO 6.4

Change-Id: I9446ada6f4deb37760cbecbc01be16e2236dcff7

diff --git a/xmlsecurity/qa/unit/signing/signing2.cxx 
b/xmlsecurity/qa/unit/signing/signing2.cxx
index 90a8f3b1e6ef..152d62a18974 100644
--- a/xmlsecurity/qa/unit/signing/signing2.cxx
+++ b/xmlsecurity/qa/unit/signing/signing2.cxx
@@ -18,6 +18,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -37,6 +38,7 @@ char const DATA_DIRECTORY[] = 
"/xmlsecurity/qa/unit/signing/data/";
 class SigningTest2 : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools
 {
 protected:
+uno::Reference mxComponentContext;
 uno::Reference mxComponent;
 uno::Reference mxSEInitializer;
 uno::Reference mxSecurityContext;
@@ -55,6 +57,7 @@ void SigningTest2::setUp()
 test::BootstrapFixture::setUp();
 
 // Initialize crypto after setting up the environment variables.
+
mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
 mxDesktop.set(frame::Desktop::create(mxComponentContext));
 }
 
@@ -105,7 +108,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest2, 
testPreserveMacroSignatureODB)
 xMetaInf->openStreamElement("macrosignatures.xml", 
embed::ElementModes::READ),
 uno::UNO_QUERY);
 std::unique_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
-xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
+xmlDocPtr pXmlDoc = parseXmlStream(pStream.get());
 
 // Make sure the signature is still there
 assertXPath(pXmlDoc, "//dsig:Signature", "Id",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppcanvas/source cui/source drawinglayer/source editeng/source emfio/source filter/source include/editeng include/svx include/tools include/vcl reportdesign/source sc/s

2020-12-24 Thread Noel Grandin (via logerrit) 
 cppcanvas/source/mtfrenderer/textaction.cxx|2 
 cui/source/tabpages/chardlg.cxx|4 -
 drawinglayer/source/primitive2d/graphicprimitive2d.cxx |2 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 
 editeng/source/editeng/impedit.hxx |2 
 editeng/source/items/textitem.cxx  |2 
 editeng/source/rtf/rtfitem.cxx |2 
 emfio/source/reader/mtftools.cxx   |2 
 filter/source/graphicfilter/eps/eps.cxx|2 
 filter/source/graphicfilter/ios2met/ios2met.cxx|8 +-
 filter/source/pdf/pdfexport.cxx|4 -
 filter/source/svg/svgwriter.cxx|4 -
 include/editeng/charrotateitem.hxx |8 +-
 include/editeng/editeng.hxx|2 
 include/svx/xgrad.hxx  |2 
 include/svx/xhatch.hxx |2 
 include/tools/degree.hxx   |4 -
 include/vcl/GraphicAttributes.hxx  |2 
 include/vcl/cursor.hxx |2 
 reportdesign/source/ui/misc/UITools.cxx|2 
 sc/source/ui/view/output.cxx   |4 -
 sc/source/ui/view/output2.cxx  |4 -
 sd/source/core/drawdoc4.cxx|4 -
 svtools/source/control/ruler.cxx   |6 -
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx|6 -
 svx/source/dialog/rubydialog.cxx   |2 
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx  |2 
 svx/source/svdraw/svdattr.cxx  |2 
 svx/source/xoutdev/xtabgrdt.cxx|   12 +--
 svx/source/xoutdev/xtabhtch.cxx|6 -
 sw/source/core/bastyp/init.cxx |2 
 sw/source/core/crsr/viscrs.cxx |2 
 sw/source/core/doc/DocumentStylePoolManager.cxx|2 
 sw/source/core/text/atrstck.cxx|4 -
 sw/source/core/text/frmpaint.cxx   |4 -
 sw/source/core/text/inftxt.cxx |8 +-
 sw/source/core/text/itrform2.cxx   |4 -
 sw/source/core/text/porlin.cxx |2 
 sw/source/core/text/pormulti.cxx   |4 -
 sw/source/core/text/porrst.cxx |2 
 sw/source/core/text/txtdrop.cxx|4 -
 sw/source/core/text/txttab.cxx |2 
 sw/source/core/txtnode/fntcache.cxx|4 -
 sw/source/core/txtnode/swfont.cxx  |   46 ++---
 sw/source/filter/ww8/docxattributeoutput.cxx   |4 -
 sw/source/filter/ww8/wrtww8.cxx|4 -
 sw/source/filter/ww8/ww8par6.cxx   |2 
 sw/source/uibase/uiview/viewstat.cxx   |2 
 tools/source/generic/point.cxx |   10 +-
 tools/source/generic/poly.cxx  |2 
 tools/source/generic/poly2.cxx |2 
 vcl/backendtest/outputdevice/gradient.cxx  |8 +-
 vcl/headless/svpgdi.cxx|4 -
 vcl/qa/cppunit/TypeSerializerTest.cxx  |2 
 vcl/qa/cppunit/svm/svmtest.cxx |2 
 vcl/qt5/Qt5Graphics_Text.cxx   |2 
 vcl/skia/gdiimpl.cxx   |8 +-
 vcl/source/bitmap/bitmappaint.cxx  |   12 +--
 vcl/source/control/fixed.cxx   |2 
 vcl/source/filter/GraphicNativeTransform.cxx   |7 -
 vcl/source/filter/jpeg/Exif.cxx|   10 +-
 vcl/source/font/PhysicalFontFace.cxx   |2 
 vcl/source/font/fontselect.cxx |8 +-
 vcl/source/gdi/gdimtf.cxx  |4 -
 vcl/source/gdi/gradient.cxx|2 
 vcl/source/gdi/pdfwriter_impl.cxx  |   10 +-
 vcl/source/gdi/sallayout.cxx   |2 
 vcl/source/gdi/wall.cxx|2 
 vcl/source/graphic/GraphicObject.cxx   |4 -
 vcl/source/graphic/GraphicObject2.cxx  |2 
 vcl/source/outdev/gradient.cxx |8 +-
 vcl/source/outdev/hatch.cxx|   20 ++---
 vcl/source/outdev/text.cxx

[Libreoffice-commits] core.git: include/tools tools/source

2020-12-24 Thread Noel Grandin (via logerrit) 
 include/tools/bigint.hxx|   54 
 tools/source/generic/bigint.cxx |   77 
 2 files changed, 94 insertions(+), 37 deletions(-)

New commits:
commit 5dae4238ea6e21df42f4437a43d152954fc494fd
Author: Noel Grandin 
AuthorDate: Wed Dec 23 10:57:00 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Dec 24 12:00:35 2020 +0100

add sal*Int64 conversions to BigInt

we have the capability, so lets use it

Change-Id: Ie5aa7999bb457d274bbcc07ba5c4e6ee2f286df1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108231
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index a8d8575fb53b..ecf7ba05b96a 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -63,30 +63,23 @@ public:
 {
 }
 
-#if SAL_TYPES_SIZEOFLONG == 4
-BigInt(int nValue)
-: nVal(nValue)
-, nLen(0)
-, bIsNeg(false)
-, bIsBig(false)
-{
-}
-#endif
-
 BigInt( double nVal );
 BigInt( sal_uInt32 nVal );
 BigInt( sal_Int64 nVal );
+BigInt( sal_uInt64 nVal );
 BigInt( const BigInt& rBigInt );
 BigInt( const OUString& rString );
-
-operatorsal_Int16() const;
-operatorsal_uInt16() const;
-operatorsal_Int32() const;
+// for some conversions, MSVC does not see int as being equivalent to sal_Int*
+#ifdef _WIN32
+BigInt( int nVal ) : BigInt(static_cast(nVal)) {}
+#endif
+inline operator sal_Int16() const;
+inline operator sal_uInt16() const;
+inline operator sal_Int32() const;
 operatorsal_uInt32() const;
+operatorsal_Int64() const;
+operatorsal_uInt64() const;
 operatordouble() const;
-#if SAL_TYPES_SIZEOFPOINTER == 8
-operatortools::Long() const;
-#endif
 
 boolIsNeg() const;
 boolIsZero() const;
@@ -101,7 +94,13 @@ public:
 BigInt& operator /=( const BigInt& rVal );
 BigInt& operator %=( const BigInt& rVal );
 
-BigInt& operator  =( sal_Int32 nValue );
+// for some conversions, MSVC does not see int as being equivalent to sal_Int*
+#ifdef _WIN32
+inline BigInt&  operator  =( int nValue ) { return 
operator=(static_cast(nValue)); }
+#endif
+inline BigInt&  operator  =( sal_Int32 nValue );
+inline BigInt&  operator  =( sal_Int64 nValue ) { return *this = 
BigInt(nValue); }
+inline BigInt&  operator  =( sal_uInt64 nValue ) { return *this = 
BigInt(nValue); }
 
 friend inline   BigInt operator +( const BigInt& rVal1, const BigInt& 
rVal2 );
 friend inline   BigInt operator -( const BigInt& rVal1, const BigInt& 
rVal2 );
@@ -143,25 +142,6 @@ inline BigInt::operator sal_Int32() const
 return 0;
 }
 
-inline BigInt::operator sal_uInt32() const
-{
-if ( !bIsBig && nVal >= 0 )
-return static_cast(nVal);
-assert(false && "out of range");
-return 0;
-}
-
-#if SAL_TYPES_SIZEOFPOINTER == 8
-inline BigInt::operator tools::Long() const
-{
-// Clamp to int32 since long is int32 on Windows.
-if (!bIsBig)
-return nVal;
-assert(false && "out of range");
-return 0;
-}
-#endif
-
 inline BigInt& BigInt::operator =( sal_Int32 nValue )
 {
 bIsBig = false;
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 62350a30c311..1239868b1432 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -594,6 +594,83 @@ BigInt::BigInt( sal_Int64 nValue )
 }
 }
 
+BigInt::BigInt( sal_uInt64 nValue )
+: nVal(0)
+{
+bIsNeg = false;
+nLen = 0;
+
+if (nValue <= SAL_MAX_INT32)
+{
+bIsBig = false;
+nVal   = static_cast(nValue);
+}
+else
+{
+bIsBig  = true;
+for (int i = 0; (i != sizeof(sal_uInt64) / 2) && (nValue != 0); ++i)
+{
+nNum[i] = static_cast(nValue & 0xUL);
+nValue = nValue >> 16;
+++nLen;
+}
+}
+}
+
+BigInt::operator sal_uInt32() const
+{
+if ( !bIsBig )
+{
+assert(nVal >= 0 && "out of range");
+return static_cast(nVal);
+}
+else
+{
+assert(nLen <= 2 && "out of range");
+assert(!bIsNeg && "out of range");
+
+int i = nLen-1;
+sal_uInt32 nRet = nNum[i];
+
+while ( i )
+{
+nRet = nRet << 16;
+i--;
+nRet |= nNum[i];
+}
+
+return nRet;
+}
+}
+
+BigInt::operator sal_Int64() const
+{
+if ( !bIsBig )
+{
+return nVal;
+}
+else
+{
+assert(nLen <= 4 && "out of range");
+assert((nLen < 4 || nNum[4] <= SAL_MAX_INT16) && "out of range");
+
+int i = nLen-1;
+sal_Int64 nRet = nNum[i];
+
+while ( i )
+{
+nRet = nRet << 16;
+i--;
+nRet |= nNum[i];
+}
+

[Libreoffice-commits] core.git: include/vcl vcl/source

2020-12-24 Thread Caolán McNamara (via logerrit) 
 include/vcl/metaact.hxx|2 +-
 vcl/source/gdi/gdimtf.cxx  |4 ++--
 vcl/source/gdi/metaact.cxx |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7efbe1a977247d91896acb389c2bbd563caf6fa3
Author: Caolán McNamara 
AuthorDate: Wed Dec 23 19:16:13 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 24 12:52:48 2020 +0100

ofz#28907 Direct-leak in MetaAction::ReadMetaAction

Change-Id: I42b278c98da36bea6d628656bbb3a382327c02d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108244
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 600afe9b6790..ef36989df80f 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -94,7 +94,7 @@ public:
 virtual boolIsTransparent() const { return false; }
 
 public:
-static MetaAction*  ReadMetaAction( SvStream& rIStm, ImplMetaReadData* 
pData );
+static rtl::Reference ReadMetaAction(SvStream& rIStm, 
ImplMetaReadData* pData);
 };
 
 class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPixelAction final : public MetaAction
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 43cfa3070c1e..7f09b25e2025 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2688,12 +2688,12 @@ SvStream& ReadGDIMetaFile(SvStream& rIStm, GDIMetaFile& 
rGDIMetaFile, ImplMetaRe
 
 for( sal_uInt32 nAction = 0; ( nAction < nCount ) && !rIStm.eof(); 
nAction++ )
 {
-MetaAction* pAction = MetaAction::ReadMetaAction(rIStm, pData);
+rtl::Reference pAction = 
MetaAction::ReadMetaAction(rIStm, pData);
 if( pAction )
 {
 if (pAction->GetType() == MetaActionType::COMMENT)
 {
-MetaCommentAction* pCommentAct = 
static_cast(pAction);
+MetaCommentAction* pCommentAct = 
static_cast(pAction.get());
 if ( pCommentAct->GetComment() == "EMF_PLUS" )
 rGDIMetaFile.UseCanvas( true );
 }
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index c966a68309e9..be8070554fc4 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -192,9 +192,9 @@ void MetaAction::Read( SvStream&, ImplMetaReadData* )
 // DO NOT read mnType - ReadMetaAction already did that!
 }
 
-MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* 
pData )
+rtl::Reference MetaAction::ReadMetaAction( SvStream& rIStm, 
ImplMetaReadData* pData )
 {
-MetaAction* pAction = nullptr;
+rtl::Reference pAction;
 sal_uInt16 nTmp = 0;
 rIStm.ReadUInt16( nTmp );
 MetaActionType nType = static_cast(nTmp);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2020-12-24 Thread Caolán McNamara (via logerrit) 
 vcl/source/filter/png/pngread.cxx |  117 --
 1 file changed, 63 insertions(+), 54 deletions(-)

New commits:
commit 95407c39168d186ee44e67b1a6a4bcf592c58b84
Author: Caolán McNamara 
AuthorDate: Wed Dec 23 19:20:16 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 24 12:53:09 2020 +0100

ofz#28902 uncaught exception

Change-Id: I94dc0e2c8466546772ae7fdd1a0f3501a8f9bfaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108245
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/filter/png/pngread.cxx 
b/vcl/source/filter/png/pngread.cxx
index cda1c3e9e4b5..2155648d1273 100644
--- a/vcl/source/filter/png/pngread.cxx
+++ b/vcl/source/filter/png/pngread.cxx
@@ -256,68 +256,77 @@ PNGReaderImpl::~PNGReaderImpl()
 
 bool PNGReaderImpl::ReadNextChunk()
 {
-if( maChunkIter == maChunkSeq.end() )
+try
 {
-// get the next chunk from the stream
-
-// unless we are at the end of the PNG stream
-if (!mrPNGStream.good() || mrPNGStream.remainingSize() < 8)
-return false;
-if( !maChunkSeq.empty() && (maChunkSeq.back().nType == PNGCHUNK_IEND) )
-return false;
-
-PNGReader::ChunkData aDummyChunk;
-maChunkIter = maChunkSeq.insert( maChunkSeq.end(), aDummyChunk );
-PNGReader::ChunkData& rChunkData = *maChunkIter;
-
-// read the chunk header
-mnChunkLen = 0;
-mnChunkType = 0;
-mrPNGStream.ReadInt32( mnChunkLen ).ReadUInt32( mnChunkType );
-rChunkData.nType = mnChunkType;
-
-// fdo#61847 truncate over-long, trailing chunks
-const std::size_t nStreamPos = mrPNGStream.Tell();
-if( mnChunkLen < 0 || nStreamPos + mnChunkLen >= mnStreamSize )
-mnChunkLen = mnStreamSize - nStreamPos;
-
-// calculate chunktype CRC (swap it back to original byte order)
-sal_uInt32 nChunkType = mnChunkType;
-#if defined(__LITTLEENDIAN) || defined(OSL_LITENDIAN)
-nChunkType = OSL_SWAPDWORD( nChunkType );
-#endif
-sal_uInt32 nCRC32 = rtl_crc32( 0, &nChunkType, 4 );
-
-// read the chunk data and check the CRC
-if( mnChunkLen && !mrPNGStream.eof() )
+if( maChunkIter == maChunkSeq.end() )
 {
-rChunkData.aData.resize( mnChunkLen );
-
-sal_Int32 nBytesRead = 0;
-do
+// get the next chunk from the stream
+
+// unless we are at the end of the PNG stream
+if (!mrPNGStream.good() || mrPNGStream.remainingSize() < 8)
+return false;
+if( !maChunkSeq.empty() && (maChunkSeq.back().nType == 
PNGCHUNK_IEND) )
+return false;
+
+PNGReader::ChunkData aDummyChunk;
+maChunkIter = maChunkSeq.insert( maChunkSeq.end(), aDummyChunk );
+PNGReader::ChunkData& rChunkData = *maChunkIter;
+
+// read the chunk header
+mnChunkLen = 0;
+mnChunkType = 0;
+mrPNGStream.ReadInt32( mnChunkLen ).ReadUInt32( mnChunkType );
+rChunkData.nType = mnChunkType;
+
+// fdo#61847 truncate over-long, trailing chunks
+const std::size_t nStreamPos = mrPNGStream.Tell();
+if( mnChunkLen < 0 || nStreamPos + mnChunkLen >= mnStreamSize )
+mnChunkLen = mnStreamSize - nStreamPos;
+
+// calculate chunktype CRC (swap it back to original byte order)
+sal_uInt32 nChunkType = mnChunkType;
+#if defined(__LITTLEENDIAN) || defined(OSL_LITENDIAN)
+nChunkType = OSL_SWAPDWORD( nChunkType );
+#endif
+sal_uInt32 nCRC32 = rtl_crc32( 0, &nChunkType, 4 );
+
+// read the chunk data and check the CRC
+if( mnChunkLen && !mrPNGStream.eof() )
 {
-sal_uInt8& rPtr = rChunkData.aData[nBytesRead];
-nBytesRead += mrPNGStream.ReadBytes(&rPtr, mnChunkLen - 
nBytesRead);
-} while (nBytesRead < mnChunkLen && mrPNGStream.good());
+rChunkData.aData.resize( mnChunkLen );
+
+sal_Int32 nBytesRead = 0;
+do
+{
+sal_uInt8& rPtr = rChunkData.aData[nBytesRead];
+nBytesRead += mrPNGStream.ReadBytes(&rPtr, mnChunkLen - 
nBytesRead);
+} while (nBytesRead < mnChunkLen && mrPNGStream.good());
 
-nCRC32 = rtl_crc32( nCRC32, rChunkData.aData.data(), mnChunkLen );
-maDataIter = rChunkData.aData.begin();
+nCRC32 = rtl_crc32( nCRC32, rChunkData.aData.data(), 
mnChunkLen );
+maDataIter = rChunkData.aData.begin();
+}
+sal_uInt32 nCheck(0);
+mrPNGStream.ReadUInt32( nCheck );
+if (!mbIgnoreCRC && nCRC32 != nCheck)
+return false;
 }
-sal_uInt32 nCheck(0);
-mrPNGS

[Libreoffice-commits] core.git: dbaccess/uiconfig

2020-12-24 Thread Caolán McNamara (via logerrit) 
 dbaccess/uiconfig/ui/applycolpage.ui  |  238 ++---
 dbaccess/uiconfig/ui/autocharsetpage.ui   |   55 +--
 dbaccess/uiconfig/ui/connectionpage.ui|  294 +++--
 dbaccess/uiconfig/ui/copytablepage.ui |  276 +++-
 dbaccess/uiconfig/ui/dbaseindexdialog.ui  |  296 -
 dbaccess/uiconfig/ui/dbasepage.ui |  126 +++
 dbaccess/uiconfig/ui/dbwizmysqlintropage.ui   |  178 --
 dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui  |   70 +---
 dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui  |  176 --
 dbaccess/uiconfig/ui/dbwiztextpage.ui |  142 +++-
 dbaccess/uiconfig/ui/directsqldialog.ui   |  210 +---
 dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui |  309 --
 12 files changed, 1116 insertions(+), 1254 deletions(-)

New commits:
commit f2835d3a2bf3037bfe8a0c891715b0c6350b07e8
Author: Caolán McNamara 
AuthorDate: Wed Dec 23 19:25:15 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 24 12:53:31 2020 +0100

drop deprecated GtkAlignment, move left/top-padding into child 
margin-start/top

for dbaccess part a

Change-Id: I08c2faf9a82bc6f007ebe02c7ebac8d9a46430e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108246
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/uiconfig/ui/applycolpage.ui 
b/dbaccess/uiconfig/ui/applycolpage.ui
index 1b3671aa6b17..dd7b5ab71e6c 100644
--- a/dbaccess/uiconfig/ui/applycolpage.ui
+++ b/dbaccess/uiconfig/ui/applycolpage.ui
@@ -54,170 +54,162 @@
 0
 none
 
-  
+  
+  
 True
 False
 True
 True
-6
-12
+12
+12
+6
 
-  
-  
+  
 True
-False
+True
 True
 True
-12
+in
 
-  
+  
 True
 True
+True
 True
 True
-in
+liststore1
+False
+1
+False
+
+  
+
 
-  
-True
-True
-True
-True
-True
-liststore1
-False
-1
-False
-
-  
-
+  
+True
+6
 
-  
-True
-6
-
-  
-  
-0
-  
-
-  
+  
+  
+0
+  
 
   
 
   
-  
-0
-0
-  
 
+  
+  
+0
+0
+  
+
+
+  
+True
+True
+True
+True
+in
 
-  
+  
 True
 True
+True
 True
 True
-in
+liststore2
+False
+1
+False
+
+  
+
 
-  
-True
-True
-True
-True
-True
-liststore2
-False
-1
-False
-
-  
-
+  
+True
+6
 
-  
-True
-6
-
-  
-  
-

[Libreoffice-commits] core.git: sd/source

2020-12-24 Thread Mark Hung (via logerrit) 
 sd/source/ui/animations/CustomAnimationPane.cxx |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 765b13b67e46aa8c8618fdad8582f8586bffce9e
Author: Mark Hung 
AuthorDate: Sat Dec 19 21:38:55 2020 +0800
Commit: Mark Hung 
CommitDate: Thu Dec 24 14:02:57 2020 +0100

tdf#138937 don't use attributes that depend on preset data

if preset data is not found. Curve, polygon, and free form
motion paths do not have preset data. Create the path
in these cases as well.

Change-Id: Idd3b24b81a15de53e302e8cb7f3636d72e10b4da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108022
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 95a0eb941597..d9f86d628f6e 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1816,14 +1816,14 @@ void CustomAnimationPane::onAdd()
 if (nEntryData)
 pDescriptor = *reinterpret_cast(nEntryData);
 
-const double fDuration = pDescriptor->getDuration();
-mxCBXDuration->set_value(fDuration*100.0, FieldUnit::NONE);
-bool bHasSpeed = pDescriptor->getDuration() > 0.001;
-mxCBXDuration->set_sensitive( bHasSpeed );
-mxFTDuration->set_sensitive( bHasSpeed );
-
 if( pDescriptor )
 {
+const double fDuration = pDescriptor->getDuration();
+mxCBXDuration->set_value(fDuration*100.0, FieldUnit::NONE);
+bool bHasSpeed = pDescriptor->getDuration() > 0.001;
+mxCBXDuration->set_sensitive( bHasSpeed );
+mxFTDuration->set_sensitive( bHasSpeed );
+
 mxCustomAnimationList->unselect_all();
 
 // gather shapes from the selection
@@ -1852,6 +1852,14 @@ void CustomAnimationPane::onAdd()
 }
 }
 
+PathKind ePathKind = getCreatePathKind();
+
+if (ePathKind != PathKind::NONE)
+{
+createPath( ePathKind, aTargets, 0.0 );
+updateMotionPathTags();
+}
+
 mrBase.GetDocShell()->SetModified();
 
 updateControls();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

2020-12-24 Thread Andrea Gelmini (via logerrit) 
 sw/source/core/edit/ednumber.cxx|2 +-
 sw/source/uibase/app/appopt.cxx |2 +-
 sw/source/uibase/docvw/FrameControlsManager.cxx |2 +-
 sw/source/uibase/utlui/content.cxx  |4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2529230d9887b6143385c5500853b7c4594db2cf
Author: Andrea Gelmini 
AuthorDate: Thu Dec 24 16:04:45 2020 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 24 18:00:19 2020 +0100

Fix typos

Change-Id: Ic283206b318e4367e5d88475bdc2abac48e79f62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108271
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index b806edc599e9..a0298ad5ad65 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -438,7 +438,7 @@ public:
 
 bool SwEditShell::MoveParagraph( tools::Long nOffset )
 {
-// make all outline nodes content temporarily visibile for paragraph move
+// make all outline nodes content temporarily visible for paragraph move
 MakeAllOutlineContentTemporarilyVisibile 
a(dynamic_cast(this));
 
 StartAllAction();
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 1d813793cff6..1ab2a7823092 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -439,7 +439,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const 
SfxItemSet& rSet )
 {
 // outline mode remained active
 // sub level treatment might have changed
-// ToggleOutlineContentVisiblity only knows sub level treatment 
after ApplyUserPref
+// ToggleOutlineContentVisibility only knows sub level treatment 
after ApplyUserPref
 for (SwNode* pNd : aFoldedOutlineNdsArray)
 GetActiveWrtShell()->ToggleOutlineContentVisibility(pNd, true);
 }
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx 
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 886021ee89f8..61bd5ca4badf 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -284,7 +284,7 @@ void 
SwFrameControlsManager::SetOutlineContentVisibilityButton(const SwTextNode*
 {
 SwNodeIndex aIdx(*pTextNd, +1);
 // there shouldn't be a layout frame
-// if there is then force visiblity false
+// if there is then force visibility false
 if 
(!m_pEditWin->GetView().GetWrtShell().GetViewOptions()->IsTreatSubOutlineLevelsAsContent())
 {
 if (!(aIdx.GetNode().IsEndNode() ||
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 378a6675e861..ec33b083d487 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2867,7 +2867,7 @@ void SwContentTree::ExecCommand(std::string_view rCmd, 
bool bOutlineWithChildren
 if 
(pShell->GetViewOptions()->IsShowOutlineContentVisibilityButton())
 {
 // make all outline nodes content visible before move
-// restore outline nodes content visibile state after move
+// restore outline nodes content visible state after move
 SwOutlineNodes rOutlineNds = 
pShell->GetDoc()->GetNodes().GetOutLineNds();
 for (SwOutlineNodes::size_type nPos = 0; nPos < 
rOutlineNds.size(); ++nPos)
 {
@@ -3403,7 +3403,7 @@ void SwContentTree::MoveOutline(SwOutlineNodes::size_type 
nTargetPos)
 if (pShell->GetViewOptions()->IsShowOutlineContentVisibilityButton())
 {
 // make all outline nodes content visible before move
-// restore outline nodes content visibile state after move
+// restore outline nodes content visible state after move
 SwOutlineNodes rOutlineNds = 
pShell->GetDoc()->GetNodes().GetOutLineNds();
 for (SwOutlineNodes::size_type nPos = 0; nPos < rOutlineNds.size(); 
++nPos)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About vcl status in avmedia (keep or removed unmaintained code since 7 years)

2020-12-24 Thread julien2412 
Hello,

On pc Debian x86-64 with master sources updated today, my local build fails
with:
/home/julien/lo/libreoffice/avmedia/source/vlc/vlcframegrabber.cxx:25:10:
fatal error: 'vcl/bitmapaccess.hxx' file not found
#include 
 ^~

It's due
https://cgit.freedesktop.org/libreoffice/core/commit/?id=17aea7c41c95186c03c173a8c6f26cd2ebce4c54
"
author  Chris Sherlock  2020-12-19 01:09:27 
+1100
committer   Tomaž Vajngerl2020-12-24 09:40:16 
+0100
commit  17aea7c41c95186c03c173a8c6f26cd2ebce4c54 (patch)
tree36c0743c40f3a85467247c585431682334ef3279
parent  d117d402853ee6c103142f0d0ccdb7cd4b8b8d05 (diff)
vcl: move access functions into appropriate bitmap access filesHEADmaster
Split class functions into BitmapInfoAccess.cxx, BitmapReadAccess.cxx
and BitmapWriteAccess.cxx

Split header files into BitmapInfoAccess.hxx and BitmapReadAccess.hxx"

but I suppose it'll be fixed soon.

I had this error and neither Jenkins nor TBs because I use "--enable-vlc" in
autogen.input.
Like other entries in autogen.input, I don't use vlc part, it's more to
detect build errors early.

However considering git history about vlc part (see
https://cgit.freedesktop.org/libreoffice/core/log/?qt=grep&q=vlc) it seems
there's no real patch since 2013 + it's been explicitely indicated as 
experimental since 2015 with
https://cgit.freedesktop.org/libreoffice/core/commit/?id=8f4044afa2426befb3f86dda21963576dbb19a9f
"avmedia: disable VLC unless in experimental model.
The code is really not in an ideal state, the key-frame generation is
horrible - involving playing the video for three seconds each time etc.
While the idea is great - the impl. and libvlc API use needs some love
from a VLC expert really."

VLC is indeed a great software but if the support of it in LO has been
unmaintained for so many years (IMHO 7 years is very long in IT domain),
should we still keep this or may we remove it?

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

2020-12-24 Thread Stephan Bergmann (via logerrit) 
 vcl/source/window/window2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44a04f68e88da833707bc829242351f349278732
Author: Stephan Bergmann 
AuthorDate: Thu Dec 24 21:09:38 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 24 22:12:30 2020 +0100

Temporarily disable assert that kills Jenkins

It was introduced by 4491cee27c80bc83493136b323af5bdd128352e7 "replace
margin-left with margin-start and margin-right with margin-end", but keeps
breaking CppunitTest_sw_dialogs_test and CppunitTest_sw_dialogs_test2 of
 now.

Change-Id: I91a7e4bdb6f39f3d6c094efe68a4accb1d6a99b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108273
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index dc3dcdc93db0..6b334257afc2 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1532,7 +1532,7 @@ bool Window::set_property(const OString &rKey, const 
OUString &rValue)
 set_border_width(rValue.toInt32());
 else if (rKey == "margin-start" || rKey == "margin-left")
 {
-assert(rKey == "margin-start" && "margin-left deprecated in favor of 
margin-start");
+//TODO: assert(rKey == "margin-start" && "margin-left deprecated in 
favor of margin-start");
 set_margin_start(rValue.toInt32());
 }
 else if (rKey == "margin-end" || rKey == "margin-right")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools tools/source

2020-12-24 Thread Stephan Bergmann (via logerrit) 
 include/tools/bigint.hxx|   54 +++-
 tools/source/generic/bigint.cxx |   77 
 2 files changed, 37 insertions(+), 94 deletions(-)

New commits:
commit ad9e04321df25824d2288a2ef1f4275f070f1cf7
Author: Stephan Bergmann 
AuthorDate: Thu Dec 24 14:23:34 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 24 22:48:15 2020 +0100

Revert "add sal*Int64 conversions to BigInt"

This reverts commit 5dae4238ea6e21df42f4437a43d152954fc494fd, which appears 
to
have ambiguitiy problems not only on Windows, but generally with 32-bit 
builds
like :

> 
/home/tdf/lode/jenkins/workspace/android_x86/tools/source/generic/bigint.cxx:501:18:
 error: conversion from 'int' to 'const BigInt' is ambiguous
> *this *= 10;
>  ^~
> 
/home/tdf/lode/jenkins/workspace/android_x86/include/tools/bigint.hxx:58:5: 
note: candidate constructor
> BigInt(sal_Int32 nValue)
> ^
> 
/home/tdf/lode/jenkins/workspace/android_x86/include/tools/bigint.hxx:66:5: 
note: candidate constructor
> BigInt( double nVal );
> ^
> 
/home/tdf/lode/jenkins/workspace/android_x86/include/tools/bigint.hxx:67:5: 
note: candidate constructor
> BigInt( sal_uInt32 nVal );
> ^
> 
/home/tdf/lode/jenkins/workspace/android_x86/include/tools/bigint.hxx:68:5: 
note: candidate constructor
> BigInt( sal_Int64 nVal );
> ^
> 
/home/tdf/lode/jenkins/workspace/android_x86/include/tools/bigint.hxx:69:5: 
note: candidate constructor
> BigInt( sal_uInt64 nVal );
> ^

Change-Id: I674b14c342ece3e170185b7ce2f34ccb8ff91c7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108186
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index ecf7ba05b96a..a8d8575fb53b 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -63,23 +63,30 @@ public:
 {
 }
 
+#if SAL_TYPES_SIZEOFLONG == 4
+BigInt(int nValue)
+: nVal(nValue)
+, nLen(0)
+, bIsNeg(false)
+, bIsBig(false)
+{
+}
+#endif
+
 BigInt( double nVal );
 BigInt( sal_uInt32 nVal );
 BigInt( sal_Int64 nVal );
-BigInt( sal_uInt64 nVal );
 BigInt( const BigInt& rBigInt );
 BigInt( const OUString& rString );
-// for some conversions, MSVC does not see int as being equivalent to sal_Int*
-#ifdef _WIN32
-BigInt( int nVal ) : BigInt(static_cast(nVal)) {}
-#endif
-inline operator sal_Int16() const;
-inline operator sal_uInt16() const;
-inline operator sal_Int32() const;
+
+operatorsal_Int16() const;
+operatorsal_uInt16() const;
+operatorsal_Int32() const;
 operatorsal_uInt32() const;
-operatorsal_Int64() const;
-operatorsal_uInt64() const;
 operatordouble() const;
+#if SAL_TYPES_SIZEOFPOINTER == 8
+operatortools::Long() const;
+#endif
 
 boolIsNeg() const;
 boolIsZero() const;
@@ -94,13 +101,7 @@ public:
 BigInt& operator /=( const BigInt& rVal );
 BigInt& operator %=( const BigInt& rVal );
 
-// for some conversions, MSVC does not see int as being equivalent to sal_Int*
-#ifdef _WIN32
-inline BigInt&  operator  =( int nValue ) { return 
operator=(static_cast(nValue)); }
-#endif
-inline BigInt&  operator  =( sal_Int32 nValue );
-inline BigInt&  operator  =( sal_Int64 nValue ) { return *this = 
BigInt(nValue); }
-inline BigInt&  operator  =( sal_uInt64 nValue ) { return *this = 
BigInt(nValue); }
+BigInt& operator  =( sal_Int32 nValue );
 
 friend inline   BigInt operator +( const BigInt& rVal1, const BigInt& 
rVal2 );
 friend inline   BigInt operator -( const BigInt& rVal1, const BigInt& 
rVal2 );
@@ -142,6 +143,25 @@ inline BigInt::operator sal_Int32() const
 return 0;
 }
 
+inline BigInt::operator sal_uInt32() const
+{
+if ( !bIsBig && nVal >= 0 )
+return static_cast(nVal);
+assert(false && "out of range");
+return 0;
+}
+
+#if SAL_TYPES_SIZEOFPOINTER == 8
+inline BigInt::operator tools::Long() const
+{
+// Clamp to int32 since long is int32 on Windows.
+if (!bIsBig)
+return nVal;
+assert(false && "out of range");
+return 0;
+}
+#endif
+
 inline BigInt& BigInt::operator =( sal_Int32 nValue )
 {
 bIsBig = false;
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 1239868b1432..62350a30c311 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -594,83 +594,6 @@ BigInt::BigInt( sal_Int64 nValue )
 }
 }
 
-BigInt::BigInt( sal_uInt64 nValue )
-: nVal(0)
-{
-bIsNeg = false;
-nLen = 0;
-
-if (nValue <= SAL_MAX_INT32)
-{
-bIsBig = false;
-

Re: About vcl status in avmedia (keep or removed unmaintained code since 7 years)

2020-12-24 Thread Chris Sherlock 
https://gerrit.libreoffice.org/c/core/+/108274 
 should fix this

Chris

> On 25 Dec 2020, at 12:56 am, julien2412  wrote:
> 
> Hello,
> 
> On pc Debian x86-64 with master sources updated today, my local build fails
> with:
> /home/julien/lo/libreoffice/avmedia/source/vlc/vlcframegrabber.cxx:25:10:
> fatal error: 'vcl/bitmapaccess.hxx' file not found
> #include 
> ^~
> 
> It's due
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=17aea7c41c95186c03c173a8c6f26cd2ebce4c54
> "
> authorChris Sherlock  2020-12-19 
> 01:09:27 +1100
> committer Tomaž Vajngerl2020-12-24 09:40:16 
> +0100
> commit17aea7c41c95186c03c173a8c6f26cd2ebce4c54 (patch)
> tree  36c0743c40f3a85467247c585431682334ef3279
> parentd117d402853ee6c103142f0d0ccdb7cd4b8b8d05 (diff)
> vcl: move access functions into appropriate bitmap access filesHEADmaster
> Split class functions into BitmapInfoAccess.cxx, BitmapReadAccess.cxx
> and BitmapWriteAccess.cxx
> 
> Split header files into BitmapInfoAccess.hxx and BitmapReadAccess.hxx"
> 
> but I suppose it'll be fixed soon.
> 
> I had this error and neither Jenkins nor TBs because I use "--enable-vlc" in
> autogen.input.
> Like other entries in autogen.input, I don't use vlc part, it's more to
> detect build errors early.
> 
> However considering git history about vlc part (see
> https://cgit.freedesktop.org/libreoffice/core/log/?qt=grep&q=vlc) it seems
> there's no real patch since 2013 + it's been explicitely indicated as 
> experimental since 2015 with
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=8f4044afa2426befb3f86dda21963576dbb19a9f
> "avmedia: disable VLC unless in experimental model.
> The code is really not in an ideal state, the key-frame generation is
> horrible - involving playing the video for three seconds each time etc.
> While the idea is great - the impl. and libvlc API use needs some love
> from a VLC expert really."
> 
> VLC is indeed a great software but if the support of it in LO has been
> unmaintained for so many years (IMHO 7 years is very long in IT domain),
> should we still keep this or may we remove it?
> 
> Julien
> 
> 
> 
> --
> Sent from: 
> http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ucb/source

2020-12-24 Thread Andrew Udvare (via logerrit) 
 ucb/source/ucp/webdav/webdavprovider.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f14b83b38d35a585976ef5d422754d8e0d0266a6
Author: Andrew Udvare 
AuthorDate: Thu Dec 24 06:04:16 2020 -0500
Commit: Noel Grandin 
CommitDate: Fri Dec 25 06:19:42 2020 +0100

ucp: fix call to getComponentContext

Commit 3f9940c2e050830051a31e4b70736132e034a9db mistakenly removed
include/ucbhelper/getcomponentcontext.hxx seeing the getComponentContext 
method
as unused.
According to that file, ucbhelper::getComponentContext was just a duplicate 
of
comphelper::getComponentContext so this commit changes to calling that 
method
instead.

Change-Id: Ibd66b56a72afce437a26417d7944ec1ace34a4eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108262
Reviewed-by: Julien Nabet 
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx 
b/ucb/source/ucp/webdav/webdavprovider.cxx
index 462e4e5a98f7..570b36e6180c 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include "webdavprovider.hxx"
@@ -106,7 +107,7 @@ static css::uno::Reference< css::uno::XInterface >
 ContentProvider_CreateInstance( const css::uno::Reference< 
css::lang::XMultiServiceFactory> & rSMgr )
 {
 css::lang::XServiceInfo* pX =
-static_cast(new ContentProvider( 
ucbhelper::getComponentContext(rSMgr) ));
+static_cast(new ContentProvider( 
comphelper::getComponentContext(rSMgr) ));
 return css::uno::Reference< css::uno::XInterface >::query( pX );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits