[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/LinkTarget.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 822b551f6ca92c9d4a8fb17dfc7ba28c272794cc Author: Michael Stahl AuthorDate: Tue Jan 25 15:22:01 2022 +0100 Commit: Stephan Bergmann CommitDate: Wed Jan 26 08:07:46 2022 +0100 gbuild: fix spurious rebuilds from gb_LinkTarget__use_libraries Apparently the eval inside of "ifeq" needs to be escaped, currently both branches of the "ifeq" are evaluated and generate makefile dependencies, which causes spurious rebuild of Library_salhelper with DISABLE_DYNLOADING unset from: make Library_salhelper && touch -c ../master/sal/osl/all/compat.cxx && make Library_salhelper (regression from ecc50f56b3282ec3b0364101d860f22fe8da9042) Change-Id: I8b5607b7a172c8b4b05abeaf4d5ff3a68d53cb14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index bb6b4b1fedbc..86533ab3f60f 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1326,7 +1326,7 @@ ifeq (,$(DISABLE_DYNLOADING)) # for faster incremental builds when the ABI is unchanged. # export files are created from the library, so this also ensures the library exists. $(foreach lib,$(call gb_LinkTarget__filter_lo_libraries,$(3)),$(if $(filter $(lib),$(gb_Library_KNOWNLIBS)), \ -$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_exports_target,$(lib))) \ +$$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_exports_target,$(lib))) \ )) else # DISABLE_DYNLOADING @@ -1335,7 +1335,7 @@ ifneq (,$(call gb_LinkTarget_does_real_link,$(1))) $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(call gb_LinkTarget__filter_sys_libraries,$(3)) $(if $(filter-out Library,gb_LinkTarget__get_workdir_linktargetclass,$(1)), \ $(foreach lib,$(call gb_LinkTarget__filter_lo_libraries,$(3)),$(if $(filter $(lib),$(gb_Library_KNOWNLIBS)), \ -$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_linktarget_target,$(lib))) \ +$$(eval $(call gb_LinkTarget_get_target,$(1)) : $(call gb_Library_get_linktarget_target,$(lib))) \ ))) endif endif # DISABLE_DYNLOADING
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/win/gdiimpl.cxx | 99 ++-
1 file changed, 39 insertions(+), 60 deletions(-)
New commits:
commit bc1b2b03718b596506db2acedd6dad10f489d9fe
Author: Mike Kaganski
AuthorDate: Sat Jan 15 11:30:42 2022 +0300
Commit: Mike Kaganski
CommitDate: Wed Jan 26 07:30:59 2022 +0100
Simplify error COM handling using exceptions
Change-Id: I2514e39bba8debcbdbb60929d2ca2f1ba3aaa2e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128456
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index e9074340e66e..f2f0d82a9047 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -16,7 +16,9 @@
#include
#include
#include
+#include
#include
+#include
#include
#include
@@ -119,39 +121,16 @@ bool
WinSkiaSalGraphicsImpl::RenderAndCacheNativeControl(CompatibleDC& rWhite, C
return true;
}
-#ifdef SAL_LOG_INFO
-static HRESULT checkResult(HRESULT hr, const char* file, size_t line)
-{
-if (FAILED(hr))
-{
-OUString sLocationString
-= OUString::createFromAscii(file) + ":" + OUString::number(line) +
" ";
-SAL_DETAIL_LOG_STREAM(SAL_DETAIL_ENABLE_LOG_INFO,
::SAL_DETAIL_LOG_LEVEL_INFO, "vcl.skia",
- sLocationString.toUtf8().getStr(),
- "HRESULT failed with: 0x" <<
OUString::number(hr, 16) << ": "
-<<
WindowsErrorStringFromHRESULT(hr));
-}
-return hr;
-}
-
-#define CHECKHR(funct) checkResult(funct, __FILE__, __LINE__)
-#else
-#define CHECKHR(funct) (funct)
-#endif
-
-sk_sp WinSkiaSalGraphicsImpl::createDirectWriteTypeface(HDC hdc,
HFONT hfont)
+sk_sp WinSkiaSalGraphicsImpl::createDirectWriteTypeface(HDC hdc,
HFONT hfont) try
{
+using sal::systools::ThrowIfFailed;
if (!dwriteDone)
{
-if (SUCCEEDED(
-CHECKHR(DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED,
__uuidof(IDWriteFactory),
-
reinterpret_cast(&dwriteFactory)
-{
-if
(SUCCEEDED(CHECKHR(dwriteFactory->GetGdiInterop(&dwriteGdiInterop
-dwriteFontMgr = SkFontMgr_New_DirectWrite(dwriteFactory.get());
-else
-dwriteFactory.clear();
-}
+ThrowIfFailed(DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED,
__uuidof(IDWriteFactory),
+
reinterpret_cast(&dwriteFactory)),
+ SAL_WHERE);
+ThrowIfFailed(dwriteFactory->GetGdiInterop(&dwriteGdiInterop),
SAL_WHERE);
+dwriteFontMgr = SkFontMgr_New_DirectWrite(dwriteFactory.get());
dwriteDone = true;
}
if (!dwriteFontMgr)
@@ -164,20 +143,17 @@ sk_sp
WinSkiaSalGraphicsImpl::createDirectWriteTypeface(HDC hdc, HFO
// For that CreateFromFaceFromHdc() is necessary. The simpler
// CreateFontFromLOGFONT() seems to search for the best matching font,
// which may not be the exact font.
-HFONT oldFont = SelectFont(hdc, hfont);
sal::systools::COMReference fontFace;
-if (FAILED(CHECKHR(dwriteGdiInterop->CreateFontFaceFromHdc(hdc,
&fontFace
{
-SelectFont(hdc, oldFont);
-return nullptr;
+comphelper::ScopeGuard g(
+[ hdc, oldFont(SelectFont(hdc, hfont)) ] { SelectFont(hdc,
oldFont); });
+ThrowIfFailed(dwriteGdiInterop->CreateFontFaceFromHdc(hdc, &fontFace),
SAL_WHERE);
}
-SelectFont(hdc, oldFont);
sal::systools::COMReference collection;
-if (FAILED(CHECKHR(dwriteFactory->GetSystemFontCollection(&collection
-return nullptr;
+ThrowIfFailed(dwriteFactory->GetSystemFontCollection(&collection),
SAL_WHERE);
sal::systools::COMReference font;
-// Do not use CHECKHR() here, as said above, this fails for our fonts.
+// As said above, this fails for our fonts.
if (FAILED(collection->GetFontFromFontFace(fontFace.get(), &font)))
{
// If not found in system collection, try our private font collection.
@@ -191,26 +167,26 @@ sk_sp
WinSkiaSalGraphicsImpl::createDirectWriteTypeface(HDC hdc, HFO
// private fonts with this newly used font.
sal::systools::COMReference dwriteFactory3;
-if
(FAILED(dwriteFactory->QueryInterface(&dwriteFactory3)))
-return nullptr;
+ThrowIfFailed(dwriteFactory->QueryInterface(&dwriteFactory3),
SAL_WHERE);
-if (!dwriteFontSetBuilder
-&&
FAILED(dwriteFactory3->CreateFontSetBuilder(&dwriteFontSetBuilder)))
-return nullptr;
+if (!dwriteFontSetBuilder)
+
ThrowIfFailed(dwriteFactory3->CreateFontSetBuilder(&dwriteFontSetBuilder),
+ SAL_WHERE);
UINT32 numberOfFiles;
-if (FAILED(fontFace->GetFiles(&numberOfFiles, n
[Libreoffice-commits] core.git: chart2/source
chart2/source/inc/AxisHelper.hxx | 36 +- chart2/source/tools/AxisHelper.cxx| 52 +++--- chart2/source/tools/ReferenceSizeProvider.cxx |4 +- chart2/source/tools/TitleHelper.cxx |2 - chart2/source/view/main/ChartView.cxx |2 - 5 files changed, 44 insertions(+), 52 deletions(-) New commits: commit b8cbb6930febadc9ae8839c9a21c4a20eb6fb609 Author: Noel Grandin AuthorDate: Tue Jan 25 21:32:52 2022 +0200 Commit: Noel Grandin CommitDate: Wed Jan 26 07:18:15 2022 +0100 use more concrete types in chart2, Diagram Change-Id: I5a836ccfe3c3c071b42664ba340ef18ff0e4ba91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128946 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 61610b5c4b9d..8cb148f393a6 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -66,7 +66,7 @@ public: static css::uno::Reference< css::chart2::XAxis > createAxis( sal_Int32 nDimensionIndex, bool bMainAxis -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram +, const rtl::Reference< ::chart::Diagram >& xDiagram , const css::uno::Reference< css::uno::XComponentContext >& xContext , ReferenceSizeProvider * pRefSizeProvider = nullptr ); @@ -79,22 +79,22 @@ public: , ReferenceSizeProvider * pRefSizeProvider = nullptr ); static void showAxis( sal_Int32 nDimensionIndex, bool bMainAxis -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram +, const rtl::Reference< ::chart::Diagram >& xDiagram , const css::uno::Reference< css::uno::XComponentContext >& xContext , ReferenceSizeProvider * pRefSizeProvider = nullptr ); static void showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); +, const rtl::Reference< ::chart::Diagram >& xDiagram ); static void hideAxis( sal_Int32 nDimensionIndex, bool bMainAxis -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); +, const rtl::Reference< ::chart::Diagram >& xDiagram ); static void hideGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); +, const rtl::Reference< ::chart::Diagram >& xDiagram ); static bool isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); +, const rtl::Reference< ::chart::Diagram >& xDiagram ); static bool isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); +, const rtl::Reference< ::chart::Diagram >& xDiagram ); static void makeAxisVisible( const css::uno::Reference< css::chart2::XAxis >& xAxis ); static void makeGridVisible( const css::uno::Reference< css::beans::XPropertySet >& xGridProperties ); @@ -111,17 +111,17 @@ public: static rtl::Reference< ::chart::BaseCoordinateSystem > getCoordinateSystemByIndex( -const css::uno::Reference< css::chart2::XDiagram >& xDiagram +const rtl::Reference< ::chart::Diagram >& xDiagram , sal_Int32 nIndex ); static rtl::Reference< ::chart::BaseCoordinateSystem > getCoordinateSystemOfAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); +, const rtl::Reference< ::chart::Diagram >& xDiagram ); static css::uno::Reference< css::chart2::XAxis > getAxis( sal_Int32 nDimensionIndex, bool bMainAxis -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); +, const rtl::Reference< ::chart::Diagram >& xDiagram ); static css::uno::Reference< css::chart2::XAxis > getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); @@ -132,7 +132,7 @@ public: static css::uno::Reference< css::chart2::XAxis > getParallelAxis( const css::uno::Reference< css::chart2::XAxis >& xAxis -, const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); +, const rtl::Reference< ::chart::Diagram >& xDiagram ); static css::uno::Reference< css::beans::XPropertySet > getGridProperties( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys @@ -143,7 +143,7 @@ public: static sal_Int32 getDim
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/controller/inc/ObjectHierarchy.hxx|2 -
chart2/source/controller/main/ChartController_Tools.cxx |2 -
chart2/source/controller/main/ObjectHierarchy.cxx |2 -
chart2/source/inc/ChartTypeTemplate.hxx |2 -
chart2/source/inc/DataSeriesHelper.hxx |9 +
chart2/source/inc/LegendHelper.hxx |4 +-
chart2/source/inc/RangeHighlighter.hxx |1
chart2/source/model/template/ChartTypeTemplate.cxx |2 -
chart2/source/model/template/PieChartTypeTemplate.cxx |4 +-
chart2/source/model/template/PieChartTypeTemplate.hxx |2 -
chart2/source/tools/DataSeriesHelper.cxx| 27 +---
chart2/source/tools/LegendHelper.cxx|3 +
12 files changed, 18 insertions(+), 42 deletions(-)
New commits:
commit ea00a6ce3b5e15ac2640983cfaaf11755d233644
Author: Noel Grandin
AuthorDate: Tue Jan 25 21:09:02 2022 +0200
Commit: Noel Grandin
CommitDate: Wed Jan 26 07:18:01 2022 +0100
use more concrete types in chart2, Diagram
Change-Id: I8640175f493d89bea7eb4780b4cbebf7d0b74a94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128945
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx
b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 014210c1c839..ac7833452c50 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -81,7 +81,7 @@ private:
void createLegendTree(
ObjectHierarchy::tChildContainer & rContainer,
const rtl::Reference<::chart::ChartModel> & xChartDoc,
-const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
+const rtl::Reference< ::chart::Diagram > & xDiagram );
void createAdditionalShapesTree( ObjectHierarchy::tChildContainer&
rContainer );
ObjectIdentifier getParentImpl(
const ObjectIdentifier& rParentOID,
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx
b/chart2/source/controller/main/ChartController_Tools.cxx
index 7e98471060a3..850ed40b1d11 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -102,7 +102,7 @@ bool lcl_deleteDataSeries(
if( xSeries.is() && xModel.is())
{
rtl::Reference< ::chart::ChartType > xChartType =
-DataSeriesHelper::getChartTypeOfSeries( xSeries,
xModel->getFirstDiagram());
+DataSeriesHelper::getChartTypeOfSeries( xSeries,
xModel->getFirstChartDiagram());
if( xChartType.is())
{
UndoGuard aUndoGuard(
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx
b/chart2/source/controller/main/ObjectHierarchy.cxx
index 5a8853278f07..63ac8edb35c9 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -191,7 +191,7 @@ void ObjectHierarchy::createTree( const
rtl::Reference<::chart::ChartModel>& xCh
void ObjectHierarchy::createLegendTree(
ObjectHierarchy::tChildContainer & rContainer,
const rtl::Reference<::chart::ChartModel> & xChartDoc,
-const Reference< XDiagram > & xDiagram )
+const rtl::Reference< Diagram > & xDiagram )
{
if( !(xDiagram.is() && LegendHelper::hasLegend( xDiagram )) )
return;
diff --git a/chart2/source/inc/ChartTypeTemplate.hxx
b/chart2/source/inc/ChartTypeTemplate.hxx
index af70bb84ccb3..a6f67d3fa6c7 100644
--- a/chart2/source/inc/ChartTypeTemplate.hxx
+++ b/chart2/source/inc/ChartTypeTemplate.hxx
@@ -149,7 +149,7 @@ public:
changeDiagram
*/
virtual void adaptDiagram(
-const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
+const rtl::Reference< ::chart::Diagram > & xDiagram );
/** Creates a 2d or 3d cartesian coordinate system with mathematically
oriented, linear scales with auto-min/max. If the given
diff --git a/chart2/source/inc/DataSeriesHelper.hxx
b/chart2/source/inc/DataSeriesHelper.hxx
index 8827a349b846..866fa7c54e9f 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -38,6 +38,7 @@ namespace com::sun::star::uno { class Any; }
namespace com::sun::star::uno { template class Sequence; }
namespace chart { class BaseCoordinateSystem; }
namespace chart { class ChartType; }
+namespace chart { class Diagram; }
namespace chart::DataSeriesHelper
{
@@ -120,13 +121,13 @@ OOO_DLLPUBLIC_CHARTTOOLS
rtl::Reference< ::chart::BaseCoordinateSystem >
getCoordinateSystemOfSeries(
const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
-const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
+const rtl::Reference< ::chart::Diagram > & xDiagram );
OOO_DLLPUBLIC_CHARTTOOLS
rtl::Reference< ::chart::ChartType >
getChartTypeOfSer
[Libreoffice-commits] core.git: sw/qa vcl/source
sw/qa/extras/tiledrendering/tiledrendering.cxx |4 ++-- vcl/source/bitmap/BitmapReadAccess.cxx |5 - 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 688051edf59a311371b84ea34db4991d3a164d52 Author: Dennis Francis AuthorDate: Thu Nov 11 15:22:28 2021 +0530 Commit: Dennis Francis CommitDate: Wed Jan 26 06:58:09 2022 +0100 lok: copy over the alpha channel too for cairo... ...based svp-graphics Conflicts: vcl/source/gdi/bmpacc2.cxx Change-Id: I653a8e4048c712911f44f610e13c7f6c3e323de2 (cherry picked from commit a9c473c3306e28462f9a1898a94277cf0adcbe5e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128891 Tested-by: Jenkins Reviewed-by: Dennis Francis diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index cc50ef8e9c83..b321ae9306a6 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -2879,7 +2879,7 @@ void SwTiledRenderingTest::testHighlightNumbering() // Yellow highlighting over numbering Color aColor(pAccess->GetPixel(103, 148)); -CPPUNIT_ASSERT_EQUAL(COL_YELLOW, aColor); +CPPUNIT_ASSERT_EQUAL(Color(ColorTransparency, 0xFF, 0xFF, 0xFF, 0x00), aColor); } void SwTiledRenderingTest::testHighlightNumbering_shd() @@ -2904,7 +2904,7 @@ void SwTiledRenderingTest::testHighlightNumbering_shd() // No highlighting over numbering - w:shd does not apply to numbering. Color aColor(pAccess->GetPixel(103, 148)); -CPPUNIT_ASSERT_EQUAL(COL_WHITE, aColor); +CPPUNIT_ASSERT_EQUAL(Color(ColorTransparency, 0xFF, 0xFF, 0xFF, 0xFF), aColor); } void SwTiledRenderingTest::testPilcrowRedlining() diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx b/vcl/source/bitmap/BitmapReadAccess.cxx index 6e87debd1ec1..08c148a4d3fe 100644 --- a/vcl/source/bitmap/BitmapReadAccess.cxx +++ b/vcl/source/bitmap/BitmapReadAccess.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -457,6 +458,8 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgrx(ConstScanline pScanline, t aBitmapColor.SetBlue(*pScanline++); aBitmapColor.SetGreen(*pScanline++); aBitmapColor.SetRed(*pScanline); +if (comphelper::LibreOfficeKit::isActive()) +aBitmapColor.SetAlpha(0xFF - *(++pScanline)); return aBitmapColor; } @@ -480,7 +483,7 @@ void BitmapReadAccess::SetPixelForN32BitTcBgrx(Scanline pScanline, tools::Long n *pScanline++ = rBitmapColor.GetBlue(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline++ = rBitmapColor.GetRed(); -*pScanline = 0xFF; +*pScanline = (comphelper::LibreOfficeKit::isActive()) ? 0xFF - rBitmapColor.GetAlpha() : 0xFF; } BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline, tools::Long nX,
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/tiledrendering/LOKitSearchTest.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit e9fce801c2a888b76fd8230343b04f72b5b6b5ce Author: yalda AuthorDate: Tue Jan 25 03:35:38 2022 +0330 Commit: Hossein CommitDate: Wed Jan 26 02:45:00 2022 +0100 tdf#139734 deleting redundant asserts after MacrosTest::loadFromDesktop Change-Id: I5cd2d05913f5c90499e3454e108d43ad75eee09c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/12 Tested-by: Jenkins Reviewed-by: Hossein diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx index 7f486b910ac2..aebf5d19a419 100644 --- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx +++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx @@ -121,7 +121,6 @@ LOKitSearchTest::createDoc(const char* pName, const uno::Sequence(mxComponent.get()); CPPUNIT_ASSERT(pImpressDocument); pImpressDocument->initializeForTiledRendering(rArguments);
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-54'
Tag 'cp-6.4-54' created by Andras Timar at 2022-01-25 20:55 + cp-6.4-54 Changes since cp-6.4-53-29: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-54'
Tag 'cp-6.4-54' created by Andras Timar at 2022-01-25 20:55 + cp-6.4-54 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-54'
Tag 'cp-6.4-54' created by Andras Timar at 2022-01-25 20:55 + cp-6.4-54 Changes since cp-6.4-branch-point-11: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-54'
Tag 'cp-6.4-54' created by Andras Timar at 2022-01-25 20:55 + cp-6.4-54 Changes since co-6.4-20: Andras Timar (1): update Danish dictionary --- da_DK/README_da_DK.txt |4 da_DK/da_DK.aff| 3401 da_DK/da_DK.dic|288016 +++-- da_DK/description.xml |9 4 files changed, 139245 insertions(+), 152185 deletions(-) ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0fdc89caed84f63c4c954951be80b11e417de726 Author: Andras Timar AuthorDate: Tue Jan 25 21:54:38 2022 +0100 Commit: Andras Timar CommitDate: Tue Jan 25 21:54:38 2022 +0100 Bump version to 6.4-54 Change-Id: I84ef6f9f36072c2874f279e4e3bb1c8e80bf7bad diff --git a/configure.ac b/configure.ac index c9dfd480e767..716e2bcaf0c8 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([Collabora Office],[6.4.10.53],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.4.10.54],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source
vcl/source/window/layout.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7e0eefac2fc6203fa7e853cd4049457f1d3b377b
Author: Tor Lillqvist
AuthorDate: Tue Jan 25 16:57:09 2022 +0200
Commit: Andras Timar
CommitDate: Tue Jan 25 21:33:45 2022 +0100
Add sanity check to avoid potential crash in the Collabora Online server
Make sure some coordinates don't become huge negative numbers. This
doesn't fix the unknown root cause of course.
I could not actually reproduce the crash with a server based on this
branch, though. There already was such a sanity check here in this
branch, but for Android only. I now made it cross-platform.
Let's use the same Change-Id as in the corresponding commit in the
co-2021 branch.
Change-Id: I28e343271b3f80ac203b52db1be58d2add89eecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128932
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index edebff002f8f..5c7a9d1e4355 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -267,10 +267,11 @@ void VclBox::setAllocation(const Size &rAllocation)
// Though the dialogs are rendered in javascript for LOK Android some widgets
like weld::DrawingArea
// is sent as bitmap but it is rendered from only the visible part
// when it gets negative, it shrinks instead of expands and it becomes
invisible
-#if HAVE_FEATURE_ANDROID_LOK
if (nExtraSpace < 0)
+{
+SAL_WARN("vcl.layout", "nExtraSpace went negative, setting to
zero");
nExtraSpace = 0;
-#endif
+}
}
//Split into those we pack from the start onwards, and those we pack from
the end backwards
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/mysqlc/mysqlc_catalog.hxx |2
connectivity/source/drivers/mysqlc/mysqlc_tables.cxx | 54 --
connectivity/source/drivers/mysqlc/mysqlc_tables.hxx |9 ++-
connectivity/source/drivers/mysqlc/mysqlc_views.cxx |9 +++
4 files changed, 54 insertions(+), 20 deletions(-)
New commits:
commit eb69767d7c1bb8e6e780fd9503f08c9d7f5ecb45
Author: Julien Nabet
AuthorDate: Tue Jan 25 19:22:42 2022 +0100
Commit: Julien Nabet
CommitDate: Tue Jan 25 21:07:26 2022 +0100
Mysql/MariaDB: after creating a view then refresh, make it appear as a view
For this, I took example on hsqldb part this time (instead of Firebird
which is uncomplete).
Also, deleting a brand new created table works now.
Of course, there are still pb with schema containing special characters
like "`"
Change-Id: I4849f412ed5b3c2f35fbb4caaf06577828cc255a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128943
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_catalog.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_catalog.hxx
index 288367f38e33..1bea18c7667b 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_catalog.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_catalog.hxx
@@ -29,6 +29,8 @@ public:
// IRefreshableUsers
virtual void refreshUsers() override;
+
+sdbcx::OCollection* getPrivateTables() const { return m_pTables.get(); }
};
} // namespace connectivity::mysqlc
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
index eb3995160422..ee82134086e9 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
@@ -153,28 +153,48 @@ css::uno::Reference
connectivity::mysqlc::Tables::crea
}
//- XAppend ---
-connectivity::sdbcx::ObjectType connectivity::mysqlc::Tables::appendObject(
-const OUString& /* rName */, const
css::uno::Reference& rDescriptor)
+void connectivity::mysqlc::Tables::createTable(
+const css::uno::Reference& descriptor)
{
-OUString sSql(
-::dbtools::createSqlCreateTableStatement(rDescriptor,
m_xMetaData->getConnection()));
-OUString sCatalog, sSchema, sComposedName, sTable;
-const css::uno::Reference& xConnection =
m_xMetaData->getConnection();
-
-::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
+const css::uno::Reference xConnection =
m_xMetaData->getConnection();
+OUString aSql = ::dbtools::createSqlCreateTableStatement(descriptor,
xConnection);
-
rDescriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME))
>>= sCatalog;
-
rDescriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))
>>= sSchema;
-rDescriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))
>>= sTable;
+css::uno::Reference xStmt =
xConnection->createStatement();
+if (xStmt.is())
+{
+xStmt->execute(aSql);
+::comphelper::disposeComponent(xStmt);
+}
+}
-sComposedName = ::dbtools::composeTableName(m_xMetaData, sCatalog,
sSchema, sTable, true,
-
::dbtools::EComposeRule::InTableDefinitions);
-if (sComposedName.isEmpty())
-::dbtools::throwFunctionSequenceException(xConnection);
+// XAppend
+connectivity::sdbcx::ObjectType connectivity::mysqlc::Tables::appendObject(
+const OUString& _rForName, const
css::uno::Reference& descriptor)
+{
+createTable(descriptor);
+return createObject(_rForName);
+}
-m_xMetaData->getConnection()->createStatement()->execute(sSql);
+void connectivity::mysqlc::Tables::appendNew(const OUString& _rsNewTable)
+{
+insertElement(_rsNewTable, nullptr);
+
+// notify our container listeners
+css::container::ContainerEvent aEvent(static_cast(this),
+ css::uno::makeAny(_rsNewTable),
css::uno::Any(),
+ css::uno::Any());
+comphelper::OInterfaceIteratorHelper3 aListenerLoop(m_aContainerListeners);
+while (aListenerLoop.hasMoreElements())
+aListenerLoop.next()->elementInserted(aEvent);
+}
-return createObject(sComposedName);
+OUString
+connectivity::mysqlc::Tables::getNameForObject(const
connectivity::sdbcx::ObjectType& _xObject)
+{
+OSL_ENSURE(_xObject.is(), "OTables::getNameForObject: Object is NULL!");
+return ::dbtools::composeTableName(m_xMetaData, _xObject,
+
::dbtools::EComposeRule::InDataManipulation, false)
+.replaceAll(u"`", u"̀ `");
}
//- XDrop -
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_tables.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_tables.hxx
in
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpvd.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 67240ca4191bfda561b2949905d29e6c2ed4a09f
Author: Caolán McNamara
AuthorDate: Tue Jan 25 16:49:49 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 20:40:50 2022 +0100
don't use oversized surfaces
which leads to warnings of "rendering text failed with stretch ratio of:
10, invalid value (typically too big) for the size of the input
(surface, pattern, etc.)" on my 200% scaled hidpi
a problem since:
commit cf9be3417bc2be5f772c03180b7cbd248b82cad5
Date: Tue Jan 11 19:08:50 2022 +0100
avoid Xlib cairo surfaces for small virtual devices (bsc#1183308)
where the nNewDX/nNewDY passed to the cairo_surface_create_similar
branch should remain as the unscaled sizes.
This does change the meaning of
(nNewDX <= 32 && nNewDY <= 32)
for the hidpi case, but presumably that's ok
Change-Id: I663a399c0e9c8480437a5663329cf753d69eb155
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128938
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
Reviewed-by: Caolán McNamara
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 92c54a013e0e..76cb53fc1745 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -85,18 +85,22 @@ void SvpSalVirtualDevice::CreateSurface(tools::Long nNewDX,
tools::Long nNewDY,
else
{
dl_cairo_surface_get_device_scale(m_pRefSurface, &fXScale, &fYScale);
-nNewDX *= fXScale;
-nNewDY *= fYScale;
}
if (pBuffer)
{
+nNewDX *= fXScale;
+nNewDY *= fYScale;
+
m_pSurface = cairo_image_surface_create_for_data(pBuffer,
CAIRO_FORMAT_ARGB32,
nNewDX, nNewDY,
cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, nNewDX));
dl_cairo_surface_set_device_scale(m_pSurface, fXScale, fYScale);
}
else if(nNewDX <= 32 && nNewDY <= 32)
{
+nNewDX *= fXScale;
+nNewDY *= fYScale;
+
// Force image-based surface if small. Small VirtualDevice instances
are often used for small
// temporary bitmaps that will eventually have GetBitmap() called on
them, which would cause
// X Server roundtrip with Xlib-based surface, which may be way more
costly than doing the drawing
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpvd.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 02363fb279d60f3f5a0328f43a048960028ac5c3 Author: Caolán McNamara AuthorDate: Tue Jan 25 16:45:04 2022 + Commit: Caolán McNamara CommitDate: Tue Jan 25 20:38:45 2022 +0100 log where cairo surface error really started otherwise later seen at: vcl/unx/generic/gdi/cairotextrender.cxx:283: rendering text failed with stretch ratio of: 10, invalid value (typically too big) for the size of the input (surface, pattern, etc.) Change-Id: Iaf65213bbfcf64f09bae8c83efea75e70b8a9c4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128937 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index 4d82a46e50c4..92c54a013e0e 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -109,6 +109,8 @@ void SvpSalVirtualDevice::CreateSurface(tools::Long nNewDX, tools::Long nNewDY, m_pSurface = cairo_surface_create_similar(m_pRefSurface, CAIRO_CONTENT_COLOR_ALPHA, nNewDX, nNewDY); // Device scale is inherited in this case. } + +SAL_WARN_IF(cairo_surface_status(m_pSurface) != CAIRO_STATUS_SUCCESS, "vcl", "surface of size " << nNewDX << " by " << nNewDY << " creation failed with status of: " << cairo_status_to_string(cairo_surface_status(m_pSurface))); } bool SvpSalVirtualDevice::SetSizeUsingBuffer( tools::Long nNewDX, tools::Long nNewDY,
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx |2
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx |5
chart2/source/controller/dialogs/DataBrowserModel.cxx |2
chart2/source/controller/dialogs/DialogModel.cxx | 14
chart2/source/controller/dialogs/dlg_DataSource.cxx |3
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 24 -
chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx |6
chart2/source/controller/inc/ObjectHierarchy.hxx |6
chart2/source/controller/main/ObjectHierarchy.cxx |7
chart2/source/controller/sidebar/ChartSeriesPanel.cxx |2
chart2/source/inc/AxisHelper.hxx |7
chart2/source/inc/ChartTypeTemplate.hxx |2
chart2/source/inc/DataSourceHelper.hxx|3
chart2/source/inc/DiagramHelper.hxx | 55 +--
chart2/source/inc/RegressionCurveHelper.hxx |3
chart2/source/inc/ThreeDHelper.hxx| 34 +-
chart2/source/model/template/BarChartTypeTemplate.cxx |5
chart2/source/model/template/BarChartTypeTemplate.hxx |2
chart2/source/model/template/ChartTypeTemplate.cxx| 10
chart2/source/tools/AxisHelper.cxx|8
chart2/source/tools/DataSourceHelper.cxx |8
chart2/source/tools/DiagramHelper.cxx | 150 +++--
chart2/source/tools/RangeHighlighter.cxx | 15
chart2/source/tools/ReferenceSizeProvider.cxx |9
chart2/source/tools/RegressionCurveHelper.cxx |2
chart2/source/tools/ThreeDHelper.cxx | 164 --
chart2/source/tools/TitleHelper.cxx | 14
chart2/source/view/diagram/VDiagram.cxx | 30 -
chart2/source/view/inc/VDiagram.hxx |9
chart2/source/view/main/ChartView.cxx | 25 -
30 files changed, 283 insertions(+), 343 deletions(-)
New commits:
commit 39f452953e12e24350e7a3740129fa4930aedfca
Author: Noel Grandin
AuthorDate: Tue Jan 25 20:17:29 2022 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 25 20:23:08 2022 +0100
use more concrete types in chart2, Diagram
Change-Id: I40cd39d0878dc56e4e86e05149c9744cb563d745
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128942
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 3b0a56818e77..3afac39a2ce8 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -647,7 +647,7 @@ void ChartDataWrapper::applyData( lcl_Operator&
rDataOperator )
return;
uno::Reference< chart2::data::XDataSource > xSource(
xDataProvider->createDataSource( aArguments ) );
-uno::Reference< chart2::XDiagram > xDia( xChartDoc->getFirstDiagram() );
+rtl::Reference< Diagram > xDia( xChartDoc->getFirstChartDiagram() );
if( xDia.is() )
xDia->setDiagramData( xSource, aArguments );
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 1054d20b3088..b3263d45c090 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -25,6 +25,7 @@
#include "WallFloorWrapper.hxx"
#include "MinMaxLineWrapper.hxx"
#include "UpDownBarWrapper.hxx"
+#include
#include
#include
#include
@@ -438,7 +439,7 @@ struct StaticDiagramWrapperPropertyArray : public
rtl::StaticAggregate< Sequence
{
};
-bool lcl_isXYChart( const Reference< chart2::XDiagram >& rDiagram )
+bool lcl_isXYChart( const rtl::Reference< ::chart::Diagram >& rDiagram )
{
bool bRet = false;
rtl::Reference< ::chart::ChartType > xChartType(
::chart::DiagramHelper::getChartTypeByIndex( rDiagram, 0 ) );
@@ -453,7 +454,7 @@ bool lcl_isXYChart( const Reference< chart2::XDiagram >&
rDiagram )
sal_Int32 lcl_getNewAPIIndexForOldAPIIndex(
sal_Int32 nOldAPIIndex
-, const Reference< chart2::XDiagram >& xDiagram )
+, const rtl::Reference< ::chart::Diagram >& xDiagram )
{
sal_Int32 nNewAPIIndex = nOldAPIIndex;
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 6171c1c87242..c7f91e490dcf 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -205,7 +205,7 @@ private:
OUString m_aRole;
};
-bool lcl_ShowCategoriesAsD
[Libreoffice-commits] dev-tools.git: uitest/mass-testing
uitest/mass-testing/registrymodifications.xcu |1 + 1 file changed, 1 insertion(+) New commits: commit fa743edde732847dc8fe237f53c55b408bbc367e Author: Xisco Fauli AuthorDate: Tue Jan 25 20:12:56 2022 +0100 Commit: Xisco Fauli CommitDate: Tue Jan 25 20:12:56 2022 +0100 mass-testing: disable ReplaceCellsWarning Change-Id: If33c42b72f638cbe6f1a80342be98de91d263391 diff --git a/uitest/mass-testing/registrymodifications.xcu b/uitest/mass-testing/registrymodifications.xcu index f992e48..55c7228 100644 --- a/uitest/mass-testing/registrymodifications.xcu +++ b/uitest/mass-testing/registrymodifications.xcu @@ -15,4 +15,5 @@ true false false +false
[Libreoffice-commits] dev-tools.git: uitest/mass-testing
uitest/mass-testing/calc.py| 94 +
uitest/mass-testing/impress.py | 54 +--
uitest/mass-testing/run.py |8 +++
uitest/mass-testing/writer.py | 60 +-
4 files changed, 80 insertions(+), 136 deletions(-)
New commits:
commit 440b0829fbc323910644b93b395b14392984b2c9
Author: Xisco Fauli
AuthorDate: Tue Jan 25 18:32:25 2022 +0100
Commit: Xisco Fauli
CommitDate: Tue Jan 25 20:10:11 2022 +0100
mass-testing: Adapt code to new uitest code
Change-Id: Iee0161d1e404436fb3a23a740ecb2418eb5caaf5
diff --git a/uitest/mass-testing/calc.py b/uitest/mass-testing/calc.py
index b8c1879..6b9c5c5 100755
--- a/uitest/mass-testing/calc.py
+++ b/uitest/mass-testing/calc.py
@@ -8,40 +8,37 @@ import os
import signal
from uitest.framework import UITestCase
from libreoffice.uno.propertyvalue import mkPropertyValues
-import time
+from contextlib import contextmanager
#Max number of sheets to jump to
maxSheets = 10
class massTesting(UITestCase):
+@contextmanager
def load_file(self):
#TODO: Ignore password protected files
fileName = os.environ["TESTFILENAME"]
-self.ui_test.create_doc_in_start_center("calc")
+with self.ui_test.load_file(fileName) as document:
-self.ui_test.load_file(fileName)
-document = self.ui_test.get_component()
-
-
-# Ignore read-only or protected files
-if not hasattr(document, 'isReadonly') or document.isReadonly() or
document.isProtected():
-print("mass-uitesting:skipped", flush=True)
-return
+# Ignore read-only or protected files
+if not hasattr(document, 'isReadonly') or document.isReadonly() or
document.isProtected():
+print("mass-uitesting:skipped", flush=True)
+raise
-try:
-xDoc = self.xUITest.getTopFocusWindow()
-xEdit = xDoc.getChild("grid_window")
-except:
-#In case the mimetype is wrong and the file is open with another
component
-print("mass-uitesting:skipped", flush=True)
-return
+try:
+xDoc = self.xUITest.getTopFocusWindow()
+xEdit = xDoc.getChild("grid_window")
+except:
+#In case the mimetype is wrong and the file is open with
another component
+print("mass-uitesting:skipped", flush=True)
+raise
-print("mass-uitesting:loaded", flush=True)
+print("mass-uitesting:loaded", flush=True)
-return xEdit
+yield xEdit
def go_to_first_sheet(self):
document = self.ui_test.get_component()
@@ -63,8 +60,7 @@ class massTesting(UITestCase):
return nrSheets
def test_remove_all_and_undo(self):
-xEdit = self.load_file()
-if xEdit:
+with self.load_file() as xEdit:
nrSheets = self.go_to_first_sheet()
for i in range(nrSheets)[:maxSheets]:
@@ -74,11 +70,8 @@ class massTesting(UITestCase):
self.xUITest.executeCommand(".uno:Undo")
self.xUITest.executeCommand(".uno:JumpToNextTable")
-self.ui_test.close_doc()
-
def test_insert_column_and_undo(self):
-xEdit = self.load_file()
-if xEdit:
+with self.load_file() as xEdit:
nrSheets = self.go_to_first_sheet()
for i in range(nrSheets)[:maxSheets]:
@@ -86,11 +79,8 @@ class massTesting(UITestCase):
self.xUITest.executeCommand(".uno:Undo")
self.xUITest.executeCommand(".uno:JumpToNextTable")
-self.ui_test.close_doc()
-
def test_insert_row_and_undo(self):
-xEdit = self.load_file()
-if xEdit:
+with self.load_file() as xEdit:
nrSheets = self.go_to_first_sheet()
for i in range(nrSheets)[:maxSheets]:
@@ -98,11 +88,8 @@ class massTesting(UITestCase):
self.xUITest.executeCommand(".uno:Undo")
self.xUITest.executeCommand(".uno:JumpToNextTable")
-self.ui_test.close_doc()
-
def test_copy_all_paste_undo(self):
-xEdit = self.load_file()
-if xEdit:
+with self.load_file() as xEdit:
nrSheets = self.go_to_first_sheet()
for i in range(nrSheets)[:maxSheets]:
@@ -118,11 +105,8 @@ class massTesting(UITestCase):
self.xUITest.executeCommand(".uno:JumpToNextTable")
-self.ui_test.close_doc()
-
def test_print_preview(self):
-xEdit = self.load_file()
-if xEdit:
+with self.load_file() as xEdit:
nrSheets = self.go_to_first_sheet()
for i in range(nrSheets)[:maxSheets]:
@@ -132,11 +116,8 @@ class massTesting(UITestCase):
self.xUITest.getTopFocusWindow()
-self.ui_test.close_doc()
-
def test_hide_column_
[Libreoffice-commits] core.git: basic/source
basic/source/inc/runtime.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d1207a5f3a573dbe39a7874931ce373e5c88628d
Author: VaibhavMalik4187
AuthorDate: Tue Jan 25 13:52:11 2022 +0530
Commit: Mike Kaganski
CommitDate: Tue Jan 25 19:54:54 2022 +0100
tdf#90341 Clean Up Excessive const_cast'ing
Change-Id: Ib4cab4a4e476b469378b0b86d0819d4642f38893
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128907
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index d09db071a1a9..d0922e6a0e0a 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -188,7 +188,7 @@ public:
SbiDdeControl* GetDdeControl() { return pDdeCtrl.get(); }
StarBASIC* GetBasic() { return pBasic; }
SbiDllMgr* GetDllMgr();
-SbiRTLData& GetRTLData() const { return const_cast(aRTLData);
}
+SbiRTLData& GetRTLData() { return aRTLData; }
std::shared_ptr const & GetNumberFormatter();
sal_uInt32 GetStdDateIdx() const { return nStdDateIdx; }
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/controller/dialogs/DialogModel.cxx|2
chart2/source/controller/main/ObjectHierarchy.cxx | 23 ++--
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 13 +-
chart2/source/inc/ChartTypeHelper.hxx | 65 +--
chart2/source/inc/ChartTypeTemplate.hxx |5
chart2/source/inc/DiagramHelper.hxx | 10 -
chart2/source/model/template/ChartTypeTemplate.cxx | 33 --
chart2/source/tools/AxisHelper.cxx | 13 +-
chart2/source/tools/ChartTypeHelper.cxx | 88 ++--
chart2/source/tools/DiagramHelper.cxx | 83 ++-
chart2/source/tools/SceneProperties.cxx |1
chart2/source/tools/ThreeDHelper.cxx|8 -
12 files changed, 141 insertions(+), 203 deletions(-)
New commits:
commit 8a2da2585f2dc031235cda98ecd811683755474e
Author: Noel Grandin
AuthorDate: Tue Jan 25 18:58:10 2022 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 25 19:15:00 2022 +0100
use more concrete types in chart2, ChartType
Change-Id: I0f95c0a7be864ebde5f3234e77e4f915f57ffdcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128939
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/inc/ChartTypeHelper.hxx
b/chart2/source/inc/ChartTypeHelper.hxx
index d2c52876a7ff..cd5985f9a51c 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -75,11 +75,11 @@ public:
getAxisType( const rtl::Reference< ::chart::ChartType >&
xChartType
, sal_Int32 nDimensionIndex );
-static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const
css::uno::Reference<
-css::chart2::XChartType >& xChartType );
+static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const
rtl::Reference<
+::chart::ChartType >& xChartType );
-static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const
css::uno::Reference<
-css::chart2::XChartType >& xChartType );
+static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const
rtl::Reference<
+::chart::ChartType >& xChartType );
static bool isSupportingOnlyDeepStackingFor3D( const rtl::Reference<
::chart::ChartType >& xChartType );
};
diff --git a/chart2/source/inc/ChartTypeTemplate.hxx
b/chart2/source/inc/ChartTypeTemplate.hxx
index ce78429f0135..e5594c43bdc3 100644
--- a/chart2/source/inc/ChartTypeTemplate.hxx
+++ b/chart2/source/inc/ChartTypeTemplate.hxx
@@ -230,12 +230,9 @@ public:
const css::uno::Reference< css::uno::XComponentContext >&
GetComponentContext() const { return m_xContext;}
-static void copyPropertiesFromOldToNewCoordinateSystem(
-const css::uno::Sequence< css::uno::Reference<
css::chart2::XChartType > > & rOldChartTypesSeq,
-const css::uno::Reference< css::chart2::XChartType > &
xNewChartType );
static void copyPropertiesFromOldToNewCoordinateSystem(
const std::vector< rtl::Reference< ChartType > > &
rOldChartTypesSeq,
-const css::uno::Reference< css::chart2::XChartType > &
xNewChartType );
+const rtl::Reference< ChartType > & xNewChartType );
protected:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 28f0c7303efa..997de84ad302 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -802,36 +802,11 @@ void ChartTypeTemplate::createChartTypes(
}
}
-void ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem(
-const Sequence< Reference< XChartType > > &
rOldChartTypesSeq,
-const Reference< XChartType > & xNewChartType )
-{
-Reference< beans::XPropertySet > xDestination( xNewChartType,
uno::UNO_QUERY );
-if( !xDestination.is() )
-return;
-
-OUString aNewChartType( xNewChartType->getChartType() );
-
-Reference< beans::XPropertySet > xSource;
-for( Reference< XChartType > const & xOldType : rOldChartTypesSeq )
-{
-if( xOldType.is() && xOldType->getChartType() == aNewChartType )
-{
-xSource.set( Reference< beans::XPropertySet >(xOldType,
uno::UNO_QUERY ) );
-if( xSource.is() )
-break;
-}
-}
-if( xSource.is() )
-comphelper::copyProperties( xSource, xDestination );
-}
-
void ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem(
const std::vector< rtl::Reference< ChartType > > &
rOldChartTypesSeq,
-const Reference< XChartType > & xNewChartType )
+const rtl::Reference< Chart
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-0' - vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit fb90ac4c621457786f64da4a69e515ea92fa30f3
Author: Caolán McNamara
AuthorDate: Mon Jan 24 20:09:49 2022 +
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Jan 25 19:09:40 2022 +0100
tdf#146971 changing a11y desc to replace %PRODUCTNAME has perf issues
so leave it alone, and do the conversion just for the originally
report situation as a safely backportable change with a follow up
to not allow us to get into this situation in the first place
Change-Id: I4f95f85791d0f937e53d7541804870b2cbf62b44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128820
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 4723360671758c3ac9e646382751d01b630a95d0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128825
Reviewed-by: Xisco Fauli
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f5f1498443dc..8db5257711c5 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21926,7 +21926,15 @@ namespace {
const char* pDesc = pAtkObject ?
atk_object_get_description(pAtkObject) : nullptr;
if (pDesc && pDesc[0])
{
-gtk_tooltip_set_text(tooltip, pDesc);
+if (ResHookProc pStringReplace =
Translate::GetReadStringHook())
+{
+// tdf#142704 %PRODUCTNAME shown in extended tips
+OUString aDesc(pDesc, strlen(pDesc),
RTL_TEXTENCODING_UTF8);
+aDesc = (*pStringReplace)(aDesc);
+gtk_tooltip_set_text(tooltip, OUStringToOString(aDesc,
RTL_TEXTENCODING_UTF8).getStr());
+}
+else
+gtk_tooltip_set_text(tooltip, pDesc);
return true;
}
#endif
@@ -22484,18 +22492,6 @@ private:
aTooltip = (*m_pStringReplace)(aTooltip);
gtk_widget_set_tooltip_text(pWidget,
OUStringToOString(aTooltip, RTL_TEXTENCODING_UTF8).getStr());
}
-
-#if !GTK_CHECK_VERSION(4, 0, 0)
-// tdf#142704 %PRODUCTNAME shown in extended tips
-AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget);
-const char* pDesc = pAtkObject ?
atk_object_get_description(pAtkObject) : nullptr;
-if (pDesc && pDesc[0])
-{
-OUString aDesc(pDesc, strlen(pDesc), RTL_TEXTENCODING_UTF8);
-aDesc = (*m_pStringReplace)(aDesc);
-atk_object_set_description(pAtkObject,
OUStringToOString(aDesc, RTL_TEXTENCODING_UTF8).getStr());
-}
-#endif
}
// expand placeholder and collect potentially missing mnemonics
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1f44cb8ca941734c3bbb0647815125d88d67630f Author: Andrea Gelmini AuthorDate: Tue Jan 25 19:02:49 2022 +0100 Commit: Gerrit Code Review CommitDate: Tue Jan 25 19:02:49 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 4132705c109ba58744669ac21b9983bfc32fb03c - Fix typo Change-Id: Id60e34680e07b3d2842e0540eea4d9cdc07a6baa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128941 Tested-by: Jenkins Reviewed-by: Andrea Gelmini diff --git a/helpcontent2 b/helpcontent2 index 3144ec569557..4132705c109b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3144ec5695574689ffd32dcef7b7b7a29e63dbf9 +Subproject commit 4132705c109ba58744669ac21b9983bfc32fb03c
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/exponsmooth_embd.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4132705c109ba58744669ac21b9983bfc32fb03c Author: Andrea Gelmini AuthorDate: Tue Jan 25 18:57:08 2022 +0100 Commit: Andrea Gelmini CommitDate: Tue Jan 25 19:02:46 2022 +0100 Fix typo Change-Id: Id60e34680e07b3d2842e0540eea4d9cdc07a6baa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128941 Tested-by: Jenkins Reviewed-by: Andrea Gelmini diff --git a/source/text/scalc/01/exponsmooth_embd.xhp b/source/text/scalc/01/exponsmooth_embd.xhp index fcaf56dc1..92252aeec 100644 --- a/source/text/scalc/01/exponsmooth_embd.xhp +++ b/source/text/scalc/01/exponsmooth_embd.xhp @@ -33,7 +33,7 @@ timeline (mandatory): A numeric array or range. The time line (x-value) range for the historical values. -The time line doesn't have to to be sorted, the functions will sort it for calculations. The time line values must have a consistent step between them. If a constant step can't be identified in the sorted time line, the functions will return the #NUM! error. If the ranges of the time line and historical values aren't of same size, the functions will return the #N/A error.If the time line contains less than 2 periods of data, the functions will return the #VALUE! Error. +The time line doesn't have to be sorted, the functions will sort it for calculations. The time line values must have a consistent step between them. If a constant step can't be identified in the sorted time line, the functions will return the #NUM! error. If the ranges of the time line and historical values aren't of same size, the functions will return the #N/A error.If the time line contains less than 2 periods of data, the functions will return the #VALUE! Error.
[Libreoffice-commits] core.git: chart2/source
chart2/source/inc/TitleHelper.hxx|1 -
chart2/source/tools/RangeHighlighter.cxx |1 -
2 files changed, 2 deletions(-)
New commits:
commit 65627bf58bac634ef60488e533905bc428c51f83
Author: Andrea Gelmini
AuthorDate: Tue Jan 25 11:06:26 2022 +0100
Commit: Julien Nabet
CommitDate: Tue Jan 25 18:36:57 2022 +0100
Removed duplicated includes
Change-Id: I58b3245a03b7cbe37ea78833dd0ee50f8c698fff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128914
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/chart2/source/inc/TitleHelper.hxx
b/chart2/source/inc/TitleHelper.hxx
index 59696bfce54d..f6978674be0a 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -22,7 +22,6 @@
#include
#include
#include "charttoolsdllapi.hxx"
-#include
namespace chart { class ChartModel; }
namespace chart { class ReferenceSizeProvider; }
diff --git a/chart2/source/tools/RangeHighlighter.cxx
b/chart2/source/tools/RangeHighlighter.cxx
index 12d20e142466..5e89b097f2f9 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk|1
sc/source/ui/view/viewfunc.cxx | 32 ++---
sc/uiconfig/scalc/ui/warnautocorrect.ui | 74
3 files changed, 100 insertions(+), 7 deletions(-)
New commits:
commit 36121e87b7e2a2defbfe75dfdadb2dde4fff6b4f
Author: Caolán McNamara
AuthorDate: Tue Jan 25 15:49:57 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 18:36:08 2022 +0100
tdf#146970 use a textview to show the proposed replacement formula
so it can scroll and keep the text area to some finite size
no strings changes or new translations, so this is a backportable
change.
Change-Id: Ibc36812c6aa7fff8e035c06d0dad885909f057ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128933
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 336e1710958d..bc320cc44fd7 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -259,6 +259,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/validationcriteriapage \
sc/uiconfig/scalc/ui/validationhelptabpage \
sc/uiconfig/scalc/ui/validationhelptabpage-mobile \
+ sc/uiconfig/scalc/ui/warnautocorrect \
sc/uiconfig/scalc/ui/xmlsourcedialog \
sc/uiconfig/scalc/ui/zoombox \
sc/uiconfig/scalc/ui/ztestdialog \
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 247fdeda5a70..ecaa0a2cdf8a 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -337,6 +337,29 @@ namespace HelperNotifyChanges
}
}
+namespace
+{
+class AutoCorrectQuery : public weld::MessageDialogController
+{
+private:
+std::unique_ptr m_xError;
+public:
+AutoCorrectQuery(weld::Window* pParent, const OUString& rFormula)
+: weld::MessageDialogController(pParent,
"modules/scalc/ui/warnautocorrect.ui", "WarnAutoCorrect", "grid")
+, m_xError(m_xBuilder->weld_text_view("error"))
+{
+
m_xDialog->set_primary_text(ScResId(SCSTR_FORMULA_AUTOCORRECTION).trim());
+m_xDialog->set_default_response(RET_YES);
+
+const int nMaxWidth = m_xError->get_approximate_digit_width() * 65;
+const int nMaxHeight = m_xError->get_height_rows(6);
+m_xError->set_size_request(nMaxWidth, nMaxHeight);
+
+m_xError->set_text(rFormula);
+}
+};
+}
+
// actual functions
// input - undo OK
@@ -447,13 +470,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB
nTab,
nResult = RET_NO; // empty formula, just '='
else
{
-OUString aMessage = ScResId( SCSTR_FORMULA_AUTOCORRECTION
) + aCorrectedFormula;
-
-std::unique_ptr
xQueryBox(Application::CreateMessageDialog(GetViewData().GetDialogParent(),
-
VclMessageType::Question, VclButtonsType::YesNo,
- aMessage));
-xQueryBox->set_default_response(RET_YES);
-nResult = xQueryBox->run();
+AutoCorrectQuery
aQueryBox(GetViewData().GetDialogParent(), aCorrectedFormula);
+nResult = aQueryBox.run();
}
if ( nResult == RET_YES )
{
diff --git a/sc/uiconfig/scalc/ui/warnautocorrect.ui
b/sc/uiconfig/scalc/ui/warnautocorrect.ui
new file mode 100644
index ..632dbcc80360
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/warnautocorrect.ui
@@ -0,0 +1,74 @@
+
+
+
+
+
+False
+6
+popup
+True
+dialog
+True
+question
+yes-no
+
+
+False
+True
+True
+vertical
+12
+
+
+False
+
+
+False
+False
+0
+
+
+
+
+
+True
+False
+True
+True
+
+
+True
+True
+True
+True
+never
+in
+
+
+True
+True
+True
+True
+False
+char
+False
+False
+
+
+
+
+0
+0
+
+
+
+
+True
+True
+2
+
+
+
+
+
+
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/basedlgs.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15862b0118fe73a5cca10b6af05323bcab2d81cf Author: Andrea Gelmini AuthorDate: Tue Jan 25 11:07:08 2022 +0100 Commit: Julien Nabet CommitDate: Tue Jan 25 18:35:34 2022 +0100 Fix typo in code Change-Id: I5fcf8c2c4439aa7be581dcc0fd6b55cfa19f2e84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128915 Reviewed-by: Caolán McNamara Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 2adc649a8ec8..b753569efce6 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -73,7 +73,7 @@ public: voidInitialize (SfxChildWinInfo const * pInfo); boolIsClosing() const; virtual voidClose() override; -virtual voidEndDialog(int nRespose) override; +virtual voidEndDialog(int nResponse) override; virtual voidActivate() override; virtual voidDeactivate() override; virtual voidChildWinDispose() override;
Re: Making a light 'soft' in a 3D scene
Hi Armin, thank you for looking at the problem. [comments inline] Armin Le Grand schrieb am 25.01.2022 um 10:13: Hi Regina, On 1/24/22 15:51, Regina Henschel wrote: Hi Armin, hi all, a light can be 'harsh' or 'not harsh' (that means 'soft') in an extruded custom shape. This is independent from the material property 'specular'. A 'soft' light is rendered in MS Office, as if the light has a wider emitting area in real world. There are of course possible definitions for that. 'Our' light source is kept pretty simple. We have a point light source with direction, no position (all parallel). I remember that only a fraction of possibilities - the needed ones as so often - were taken into account at that time. I already had to fight to get all those 3D features we have today :-) Sure technically these can be extended. We could add a point/position, so make lighting position-dependent if wanted. Also definitions for a size of a light source are common/possible - that would lead to the light coming not only from one point, but from a sphere surrounding that point. I am not straightforward sure how to do that mathematically, but this just means to dig out the standards & integrate them. AFAIR we tried to keep as close to OpenGL at that time, so the 'old' OpenGL definitions should be most doable/integratable/fitting/implementable (due to that 1st integration of OpenGL 20++ years ago, had to be removed after 1y due to OpenGL not being stable enough on target systems - a problem on SW even with just 1% problems but scales to millions of users...). All that does not sound, as there would be an easy, simple way to extend our 3D-scene. As so often problem will be more to adapt the model data, processing, file formats, UI, etc..., then the visualization I guess. The 3D fallback SW renderer can/should be easily extended if you know what you do, it is modular. Also always a good point is to keep an eye on compatibility to standards, if we want to impl system-dependent 3D renderers, too. I see, that extending the 3D-scene would go far beyond the problem of rendering extruded custom shapes. One Q stays open, though: AFAIR those defs will/may also influence shadow which in case of soft light with non-hard boundaries will have to soften/fade, too. That would be expensive since shadow of 3D is not part of 3D scene, but generated 2D geometry that then would have to be faded -> pixel operations & in theory full back/forth transform 2D/3D to do that mathematically correctly. Also shadow on other 3D objects would be more difficult/expensive if we would once need that (not yet needed). Does our competitor do that...? Thank you for reminding me of shadows. I have ignored them up to now. I have tested it just. In MS Office UI shadow and extrusion exclude each other. That holds not only for the old binary formats, but for the 3D effects in current formats too. So that in no problem for imported shapes. HTH for the moment, Yes. It shows me, that it is better to continue with my approach to use additional lights. The extruded shape has only two lights in its file definition, but we have up to eight lights in the scene. A test with shadow will then follow. Kind regards, Regina
[Libreoffice-commits] core.git: desktop/source include/sfx2 include/vcl sc/source sd/source sfx2/Library_sfx.mk sfx2/source solenv/clang-format starmath/inc starmath/source svx/source sw/source
desktop/source/lib/init.cxx|2
include/sfx2/lokcomponenthelpers.hxx | 23
include/vcl/window.hxx |1
sc/source/ui/unoobj/docuno.cxx |2
sd/source/ui/unoidl/unomodel.cxx |2
sfx2/Library_sfx.mk|1
sfx2/source/view/lokcharthelper.cxx|2
sfx2/source/view/lokstarmathhelper.cxx | 169 ++
solenv/clang-format/excludelist|2
starmath/inc/view.hxx |4
starmath/source/view.cxx | 180 ++---
svx/source/svdraw/svdmrkv.cxx |2
sw/source/uibase/uno/unotxdoc.cxx | 32 +++--
sw/source/uibase/wrtsh/wrtsh1.cxx |8 +
14 files changed, 348 insertions(+), 82 deletions(-)
New commits:
commit 737a270c61cd2038ede7911b7d7b4afcf020f53c
Author: Mike Kaganski
AuthorDate: Mon Jan 17 17:15:46 2022 +0300
Commit: Mike Kaganski
CommitDate: Tue Jan 25 17:36:08 2022 +0100
lok: enable in-place editing of math equations
Change-Id: Ic4d187d1e2ee92eab74a6bb43e47bb4f3d47ebd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128506
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ef2365a017e6..dfbf503b269f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -108,7 +108,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/include/sfx2/lokcharthelper.hxx
b/include/sfx2/lokcomponenthelpers.hxx
similarity index 77%
rename from include/sfx2/lokcharthelper.hxx
rename to include/sfx2/lokcomponenthelpers.hxx
index 26f14b4c3129..114912253043 100644
--- a/include/sfx2/lokcharthelper.hxx
+++ b/include/sfx2/lokcomponenthelpers.hxx
@@ -57,6 +57,29 @@ public:
double fScaleX = 1.0, double fScaleY = 1.0);
};
+/// A class for math editing support via LibreOfficeKit.
+class SFX2_DLLPUBLIC LokStarMathHelper
+{
+public:
+LokStarMathHelper(SfxViewShell* pViewShell)
+: mpViewShell(pViewShell)
+{
+}
+
+vcl::Window* GetWindow();
+
+bool postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons,
int nModifier,
+double fScaleX = 1.0, double fScaleY = 1.0);
+
+private:
+css::uno::Reference& GetXController();
+tools::Rectangle GetBoundingBox();
+
+SfxViewShell* mpViewShell;
+css::uno::Reference mxController;
+VclPtr mpWindow;
+};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ce2464a1e976..fb87796bdcd3 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1458,6 +1458,7 @@ public:
virtual FactoryFunction GetUITestFactory() const;
virtual bool IsChart() const { return false; }
+virtual bool IsStarMath() const { return false; }
void SetHelpHdl(const Link& rLink);
void SetMnemonicActivateHdl(const Link& rLink);
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 5e2bc1dc5c1e..ccb98469bbde 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -81,7 +81,7 @@
#include
#endif
#include
-#include
+#include
#include
#include
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 1fb8982a17fa..0bfd6fd3dc74 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -119,7 +119,7 @@
#include
-#include
+#include
#include
#include
#include
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index b38e8b1d60b8..a8873df7c1f5 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -309,6 +309,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/view/frmload \
sfx2/source/view/ipclient \
sfx2/source/view/lokcharthelper \
+sfx2/source/view/lokstarmathhelper \
sfx2/source/view/lokhelper \
sfx2/source/view/printer \
sfx2/source/view/sfxbasecontroller \
diff --git a/sfx2/source/view/lokcharthelper.cxx
b/sfx2/source/view/lokcharthelper.cxx
index 69ec1a941421..e5965802306c 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include
+#include
#include
#include
diff --git a/sfx2/source/view/lokstarmathhelper.cxx
b/sfx2/source/view/lokstarmathhelper.cxx
new file mode 100644
index ..fedd931b08fd
--- /dev/null
+++ b/sfx2/source/view/lokstarmathhelper.cxx
@@ -0,0 +1,169 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0b9a4fd995c36c5348026f277aa28564615f2aad Author: Rafael Lima AuthorDate: Tue Jan 25 17:21:18 2022 +0100 Commit: Gerrit Code Review CommitDate: Tue Jan 25 17:21:18 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3144ec5695574689ffd32dcef7b7b7a29e63dbf9 - tdf#146911 Improve Basic DateValue description Change-Id: I41cbd011f753796b45556c5cf33e5fa93f6e7461 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128818 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d6705dd31c29..3144ec569557 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d6705dd31c29a15e6c8bd9e73e5188e6adfc1386 +Subproject commit 3144ec5695574689ffd32dcef7b7b7a29e63dbf9
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03030102.xhp | 32 ++--
1 file changed, 22 insertions(+), 10 deletions(-)
New commits:
commit 3144ec5695574689ffd32dcef7b7b7a29e63dbf9
Author: Rafael Lima
AuthorDate: Mon Jan 24 18:38:21 2022 +0100
Commit: Olivier Hallot
CommitDate: Tue Jan 25 17:21:16 2022 +0100
tdf#146911 Improve Basic DateValue description
Change-Id: I41cbd011f753796b45556c5cf33e5fa93f6e7461
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128818
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03030102.xhp
b/source/text/sbasic/shared/03030102.xhp
index f2801d80c..aea6339a0 100644
--- a/source/text/sbasic/shared/03030102.xhp
+++ b/source/text/sbasic/shared/03030102.xhp
@@ -1,5 +1,5 @@
-
+
-
DateValue Function
@@ -34,28 +33,41 @@
DateValue function
DateValue
Function
- Returns a
date value from a date string. The date string is a complete date in a single
numeric value. You can also use this serial number to determine the difference
between two dates.
+ Returns a
Date object from a string representing a date.
+ The returned object
is represented internally as a single numeric value corresponding to the
specified date. This value can be used to calculate the number of days between
two dates.
- DateValue(date)
+ DateValue(date
As String)
- Date: String
expression that contains the date that you want to calculate. In contrast to
the DateSerial function that passes years, months and days as separate numeric
values, the DateValue function requests the date string to be according to
either one of the date acceptance patterns defined for your locale setting (see
%PRODUCTNAME -
PreferencesTools -
Options - Language Settings
- Languages) or to ISO date format (momentarily, only the ISO format
with hyphens, e.g. "2012-12-31" is accepted).
+ date: A string
that contains the date that will be converted to a Date
object.
+ The string passed to
DateValue must be expressed in one of the date formats
defined by your locale setting (see %PRODUCTNAME -
PreferencesTools -
Options - Language Settings
- Languages) or using the ISO date format "-mm-dd" (year, month
and day separated by hyphens).
-The computed
date.i66764
+Date.
- Sub ExampleDateValue
- MsgBox DateValue("23/02/2011")
- End Sub
+ Sub
ExampleDateValue
+
Dim aDate As Date
+
aDate = DateValue("2021-12-20")
+ ' Prints the
localized date
+
MsgBox aDate
+ ' Extracts the
year, month and day from the date object
+
MsgBox Year(aDate)
+
MsgBox Month(aDate)
+
MsgBox Day(aDate)
+ ' Prints the
numeric value corresponding to the date (as Long type)
+
MsgBox CLng(aDate)
+ End
Sub
+
+
+
-
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a505fd840b53182514076e4ced4c6b45aa654ee Author: Olivier Hallot AuthorDate: Tue Jan 25 13:14:28 2022 -0300 Commit: Gerrit Code Review CommitDate: Tue Jan 25 17:14:28 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d6705dd31c29a15e6c8bd9e73e5188e6adfc1386 - shared/explorer/database is no more Change-Id: I286096e6de26f5a0e35200b4db7a2a89cfddcb5f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128934 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 30c15a5e4888..d6705dd31c29 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 30c15a5e48886b78d0bd3eac3e5bdf9f29cd9ac3 +Subproject commit d6705dd31c29a15e6c8bd9e73e5188e6adfc1386
[Libreoffice-commits] help.git: help3xsl/online_transform.xsl
help3xsl/online_transform.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d6705dd31c29a15e6c8bd9e73e5188e6adfc1386 Author: Olivier Hallot AuthorDate: Tue Jan 25 13:10:01 2022 -0300 Commit: Olivier Hallot CommitDate: Tue Jan 25 17:14:27 2022 +0100 shared/explorer/database is no more Change-Id: I286096e6de26f5a0e35200b4db7a2a89cfddcb5f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128934 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index c9b9a8092..4f75de400 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -194,7 +194,7 @@ - +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30921ff65522fdc730dac5cca9ee2ac4016653f8 Author: Olivier Hallot AuthorDate: Tue Jan 25 13:13:50 2022 -0300 Commit: Gerrit Code Review CommitDate: Tue Jan 25 17:13:50 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 30c15a5e48886b78d0bd3eac3e5bdf9f29cd9ac3 - Add PostgreSQL connection Help page Related to tdf#43369 where a patch has been abandonned but is nevertheless still much wanted. The db connection wizard is generic and has no information on the required connection sctrings. The Help button in the wizard is not working as of today. The issue is recurrent in user-space. Change-Id: I3a5d30f859d6fb4e12813df3fe6df35d5e2e0f68 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128887 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 919def267b89..30c15a5e4888 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 919def267b89cfe03f40218baa8c16cf65526448 +Subproject commit 30c15a5e48886b78d0bd3eac3e5bdf9f29cd9ac3
[Libreoffice-commits] help.git: AllLangHelp_sdatabase.mk source/text
AllLangHelp_sdatabase.mk |1 source/text/sdatabase/dabawiz01.xhp |1 source/text/sdatabase/dabawiz02pgsql.xhp | 50 +++ 3 files changed, 52 insertions(+) New commits: commit 30c15a5e48886b78d0bd3eac3e5bdf9f29cd9ac3 Author: Olivier Hallot AuthorDate: Mon Jan 24 17:18:29 2022 -0300 Commit: Olivier Hallot CommitDate: Tue Jan 25 17:13:49 2022 +0100 Add PostgreSQL connection Help page Related to tdf#43369 where a patch has been abandonned but is nevertheless still much wanted. The db connection wizard is generic and has no information on the required connection sctrings. The Help button in the wizard is not working as of today. The issue is recurrent in user-space. Change-Id: I3a5d30f859d6fb4e12813df3fe6df35d5e2e0f68 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128887 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk index fec5f43b9..b715812ee 100644 --- a/AllLangHelp_sdatabase.mk +++ b/AllLangHelp_sdatabase.mk @@ -66,6 +66,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\ helpcontent2/source/text/sdatabase/dabawiz02jdbc \ helpcontent2/source/text/sdatabase/dabawiz02mysql \ helpcontent2/source/text/sdatabase/dabawiz02odbc \ +helpcontent2/source/text/sdatabase/dabawiz02pgsql \ helpcontent2/source/text/sdatabase/dabawiz02oracle \ helpcontent2/source/text/sdatabase/dabawiz02spreadsheet \ helpcontent2/source/text/sdatabase/dabawiz02text \ diff --git a/source/text/sdatabase/dabawiz01.xhp b/source/text/sdatabase/dabawiz01.xhp index 2da427274..0a8b98b8e 100644 --- a/source/text/sdatabase/dabawiz01.xhp +++ b/source/text/sdatabase/dabawiz01.xhp @@ -64,6 +64,7 @@ Set up JDBC connection Set up Oracle database connection + ODBC settings Set up Spreadsheet connection diff --git a/source/text/sdatabase/dabawiz02pgsql.xhp b/source/text/sdatabase/dabawiz02pgsql.xhp new file mode 100644 index 0..91a2f0aa2 --- /dev/null +++ b/source/text/sdatabase/dabawiz02pgsql.xhp @@ -0,0 +1,50 @@ + + + + + + +PostgresSQL Connection +/text/sdatabase/dabawiz02pgsql.xhp + + + + +PostgreSQL settings (Base) + + + +PostgresSQL Connection +Specifies the options for connecting to PostgresSQL databases. + +DBMS/driver-specific connection string +Enter the driver specific connection string. The connection string is sequence of keyword/value pairs separated by spaces. For example +dbname=MyDatabase host=myHost port=5432 +where + + +dbname: the name of the database hosted in the DBMS server. + + +host: the fully qualified name of the RDBMS server + + +port: the server port. The default port for PostgreSQL is 5432. + + +You can also enter the connection string as postgresql://myHost:port/MyDatabase. + +Refer to the database server administrator for the correct values of the keywords passed in the connection string. Values for user= and password= are ignored but will be requested at connection time. +The connection string is displayed in the %PRODUCTNAME Base status bar. + +List of all keyword/value pairs for https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-PARAMKEYWORDS"; name="PG13keywords">PostgresSQL 13 connection string. Not every pair is handled by the %PRODUCTNAME driver manager. + + +
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk4/convert3to4.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 1385203dd927ac85939215d9e5b048aa49f0a4cf
Author: Caolán McNamara
AuthorDate: Tue Jan 25 14:24:26 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 17:06:21 2022 +0100
gtk4: GtkSpinButton doesn't have has-frame anymore
Change-Id: If2d230021e7b1e4777e2b663aa835e3917d896d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128929
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 3a2e28587546..89d08fce3632 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -545,6 +545,12 @@ ConvertResult Convert3To4(const
css::uno::Reference& xNode
xRemoveList.push_back(xChild);
}
+if (sName == "has-frame")
+{
+if (GetParentObjectType(xChild) == "GtkSpinButton")
+xRemoveList.push_back(xChild);
+}
+
if (sName == "toolbar-style")
{
// is there an equivalent for this ?
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bb9e718e6ae037ab0fadebe99da8f28fc5576e8a Author: Ilmari Lauhakangas AuthorDate: Tue Jan 25 17:40:01 2022 +0200 Commit: Gerrit Code Review CommitDate: Tue Jan 25 16:40:01 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 919def267b89cfe03f40218baa8c16cf65526448 - tdf#123318 tdf#129697 Don't hardcode product name in CSS and JS Change-Id: I0ef315146fed188eb1cf33c416ff5f3e9899bbae Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128524 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e1da23a64919..919def267b89 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e1da23a649197d960c8492373326e11286b3239e +Subproject commit 919def267b89cfe03f40218baa8c16cf65526448
[Libreoffice-commits] help.git: CustomTarget_html.mk help3xsl/default.css help3xsl/help2.js help3xsl/online_transform.xsl Package_html_dynamic.mk Package_html_static.mk
CustomTarget_html.mk | 29 +++--
Package_html_dynamic.mk |2 ++
Package_html_static.mk|2 --
help3xsl/default.css | 22 +++---
help3xsl/help2.js |2 +-
help3xsl/online_transform.xsl |8
6 files changed, 41 insertions(+), 24 deletions(-)
New commits:
commit 919def267b89cfe03f40218baa8c16cf65526448
Author: Ilmari Lauhakangas
AuthorDate: Tue Jan 18 09:34:15 2022 +0200
Commit: Ilmari Lauhakangas
CommitDate: Tue Jan 25 16:40:00 2022 +0100
tdf#123318 tdf#129697 Don't hardcode product name in CSS and JS
Change-Id: I0ef315146fed188eb1cf33c416ff5f3e9899bbae
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128524
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 56224a7d9..d94b85f2c 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -14,9 +14,17 @@ html_TREE_MODULES := swriter scalc simpress sdraw sdatabase
smath schart sbasic
html_TEXT_MODULES := $(html_TREE_MODULES)
html_BMARK_MODULES := swriter:WRITER scalc:CALC simpress:IMPRESS sdraw:DRAW
sdatabase:BASE smath:MATH schart:CHART sbasic:BASIC shared:SHARED
+# In case someone has a product name containing quotes, use Unicode
+# code points for ' (27) and " (22) in JS, CSS and entities for HTML.
+gb_PRODUCTNAME_JS := $(subst ',\\\u{27},$(subst ",\\\u{22},$(PRODUCTNAME)))
+gb_PRODUCTNAME_CSS := $(subst ',\\\27,$(subst ",\\\22,$(PRODUCTNAME)))
+gb_PRODUCTNAME_HTML := $(subst ',',$(subst ",",$(PRODUCTNAME)))
+
$(eval $(call gb_CustomTarget_register_targets,helpcontent2/help3xsl,\
hid2file.js \
languages.js \
+ default.css \
+ help2.js \
$(foreach lang,$(gb_HELP_LANGS),\
$(lang)/bookmarks.js \
$(lang)/contents.js \
@@ -75,7 +83,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/xap_tpl : \
$(call gb_Helper_abbreviate_dirs,\
$(call gb_ExternalExecutable_get_command,xsltproc) \
--stringparam lang $* \
- --stringparam productname "$(PRODUCTNAME)" \
+ --stringparam productname "$(gb_PRODUCTNAME_HTML)" \
--stringparam productversion "$(PRODUCTVERSION)" \
-o $@ \
$(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
@@ -103,7 +111,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/noscript.html : \
$(call gb_Helper_abbreviate_dirs,\
$(call gb_ExternalExecutable_get_command,xsltproc) \
--stringparam lang $* \
- --stringparam productname "$(PRODUCTNAME)" \
+ --stringparam productname "$(gb_PRODUCTNAME_HTML)" \
--stringparam productversion "$(PRODUCTVERSION)" \
-o $@ \
$(SRCDIR)/helpcontent2/help3xsl/noscript.xsl \
@@ -120,7 +128,6 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \
printf ']);\n' \
) > $@
-
define html_gen_langnames_js_dep
$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/langnames.js : \
$(if $(filter en-US,$(1)),$(SRCDIR),$(call
gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
@@ -177,7 +184,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \
--stringparam lang $(LANGUAGE) \
--stringparam local $(if $(HELP_ONLINE),'no','yes') \
--stringparam module $(MODULE) \
- --stringparam productname "$(PRODUCTNAME)" \
+ --stringparam productname "$(gb_PRODUCTNAME_HTML)" \
--stringparam productversion "$(PRODUCTVERSION)" \
-o $@ \
$(SRCDIR)/helpcontent2/help3xsl/get_tree.xsl \
@@ -224,7 +231,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \
--stringparam Language $* \
--stringparam local $(if
$(HELP_ONLINE),'no','yes') \
--stringparam root $(if $(filter
WNT,$(OS)),$$(cygpath -m `pwd`),`pwd`)/ \
- --stringparam productname "$(PRODUCTNAME)" \
+ --stringparam productname
"$(gb_PRODUCTNAME_HTML)" \
--stringparam productversion
"$(PRODUCTVERSION)" \
--stringparam xapian $(if $(filter TRUE,
$(HELP_OMINDEX_PAGE)),'yes','no') \
-o $(dir $@)$${xhp%.xhp}.html \
@@ -293,7 +300,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
--stringparam app $(APP) \
--stringparam Language $(HELP_LANG) \
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - include/sfx2 sc/source sfx2/source
include/sfx2/basedlgs.hxx|2 +-
sc/source/ui/dbgui/PivotLayoutDialog.cxx |3 ++-
sfx2/source/dialog/basedlgs.cxx |7 +++
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 333ad127b915e6d318df4eef4f30f9231b5f8a95
Author: Caolán McNamara
AuthorDate: Mon Jan 24 15:46:50 2022 +0200
Commit: Michael Weghorn
CommitDate: Tue Jan 25 16:38:29 2022 +0100
tdf#146571 Ignore focus changes after closing Manage changes dialog
Change-Id: Ib588310410a265acdd129a8e51adf56bb5973bd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128869
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128823
Reviewed-by: Michael Weghorn
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 2d32406e4de9..39b5df4115c2 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -48,7 +48,7 @@ public:
// when the dialog has an associated SfxChildWin, typically for Modeless
interaction
virtual void ChildWinDispose() {} // called from the associated
SfxChildWin dtor
-virtual void Close() {} // called by the SfxChildWin when the dialog is
closed
+virtual void Close(); // called by the SfxChildWin when the dialog is
closed
virtual void EndDialog(); // called by the SfxChildWin to close the dialog
};
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 39357771105d..a496b9a6efb4 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -627,7 +627,8 @@ void
ScPivotLayoutDialog::PushDataFieldNames(std::vector& rDataFieldNa
void ScPivotLayoutDialog::Close()
{
-DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
+DoClose(ScPivotLayoutWrapper::GetChildWindowId());
+SfxDialogController::Close();
}
IMPL_LINK_NOARG( ScPivotLayoutDialog, OKClicked, weld::Button&, void )
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 1f10f73ce5e4..190fea086ba9 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -197,6 +197,7 @@ void SfxModelessDialogController::Close()
m_pBindings->GetDispatcher_Impl()->ExecuteList(
m_xImpl->pMgr->GetType(),
SfxCallMode::RECORD|SfxCallMode::SYNCHRON, { &aValue } );
+SfxDialogController::Close();
}
SfxDialogController::SfxDialogController(weld::Widget* pParent, const
OUString& rUIFile,
@@ -210,6 +211,12 @@ SfxDialogController::SfxDialogController(weld::Widget*
pParent, const OUString&
m_xDialog->connect_container_focus_changed(LINK(this, SfxDialogController,
FocusChangeHdl));
}
+void SfxDialogController::Close()
+{
+// tdf3146571 ignore focus changes after we've closed
+m_xDialog->connect_container_focus_changed(Link());
+}
+
IMPL_STATIC_LINK_NOARG(SfxDialogController, InstallLOKNotifierHdl, void*,
vcl::ILibreOfficeKitNotifier*)
{
return SfxViewShell::Current();
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - include/com
include/com/sun/star/uno/Sequence.hxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ad19d0c354887ac05561ca009a3f89cc62dfe9cf
Author: Luboš Luňák
AuthorDate: Fri Jan 7 10:01:46 2022 +0100
Commit: Michael Weghorn
CommitDate: Tue Jan 25 16:31:17 2022 +0100
uno sequences with different sizes are not equal
This should often the case, and should be way faster than the UNO
data comparison.
Change-Id: Ied648d75779ef3aafd293c36906a1bab66bdeade
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128098
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit 9e7e63b8f812977b253b05db8a02dd0444de375a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128816
Reviewed-by: Michael Weghorn
diff --git a/include/com/sun/star/uno/Sequence.hxx
b/include/com/sun/star/uno/Sequence.hxx
index 7aa873e91223..23b12099791f 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -139,6 +139,8 @@ inline bool Sequence< E >::operator == ( const Sequence &
rSeq ) const
{
if (_pSequence == rSeq._pSequence)
return true;
+if (_pSequence->nElements != rSeq._pSequence->nElements)
+return false;
const Type & rType = ::cppu::getTypeFavourUnsigned( this );
return ::uno_type_equalData(
const_cast< Sequence * >( this ), rType.getTypeLibType(),
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/source
sc/source/ui/app/inputhdl.cxx |5 +++--
sc/source/ui/view/editsh.cxx |1 +
sc/source/ui/view/viewfunc.cxx |2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 5cc40c5b89c8d651e9d38d2b6d388399c3fe8664
Author: Eike Rathke
AuthorDate: Sat Jan 22 18:20:08 2022 +0100
Commit: Michael Weghorn
CommitDate: Tue Jan 25 16:30:28 2022 +0100
ScInputHandler::UpdateFormulaMode() also for multi-line formulas
Additionally sprinkle some
TODO: MLFORMULA
comments on places where multi-line formulas should be supported
as well but code currently only works for one paragraph.
Change-Id: If2630a6493910984e0abb81ff2ed42ed51394681
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128787
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit 8204d322379cbc054fb834911d88fb0fe3b040c6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128822
Reviewed-by: Michael Weghorn
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 8b4d8bde90b3..d844401a8807 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1287,6 +1287,7 @@ void ScInputHandler::ShowTipCursor()
HideTipBelow();
EditView* pActiveView = pTopView ? pTopView : pTableView;
+/* TODO: MLFORMULA: this should work also with multi-line formulas. */
if ( !(bFormulaMode && pActiveView && pFormulaDataPara &&
mpEditEngine->GetParagraphCount() == 1) )
return;
@@ -1534,7 +1535,7 @@ void ScInputHandler::UseFormulaData()
{
EditView* pActiveView = pTopView ? pTopView : pTableView;
-// Formulas may only have 1 paragraph
+/* TODO: MLFORMULA: this should work also with multi-line formulas. */
if ( !(pActiveView && pFormulaData && mpEditEngine->GetParagraphCount() ==
1) )
return;
@@ -2765,7 +2766,7 @@ void ScInputHandler::UpdateFormulaMode()
{
SfxApplication* pSfxApp = SfxGetpApp();
-bool bIsFormula = !bProtected && mpEditEngine->GetParagraphCount() == 1;
+bool bIsFormula = !bProtected;
if (bIsFormula)
{
const OUString& rText = mpEditEngine->GetText(0);
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index c7e7dabd1ee5..ba0abdc433c4 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -526,6 +526,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
case SID_TOGGLE_REL:
{
+/* TODO: MLFORMULA: this should work also with multi-line
formulas. */
if (pEngine->GetParagraphCount() == 1)
{
OUString aText = pEngine->GetText();
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index af151534c018..247fdeda5a70 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -661,7 +661,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB
nTab,
// formulas have to be recognized even if they're formatted
// (but common attributes are still collected)
-if ( !bSimple && aEngine.GetParagraphCount() == 1 )
+if (!bSimple)
{
OUString aParStr(aEngine.GetText( 0 ));
if ( aParStr[0] == '=' )
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/DialogModel.cxx | 113 ++---
chart2/source/controller/dialogs/DialogModel.hxx | 11 +-
chart2/source/controller/dialogs/tp_DataSource.cxx | 11 +-
chart2/source/controller/dialogs/tp_DataSource.hxx |4
4 files changed, 47 insertions(+), 92 deletions(-)
New commits:
commit 1376b1c01f678311934afc5bafc0e4d72a09b9c6
Author: Noel Grandin
AuthorDate: Mon Jan 24 20:45:47 2022 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 25 16:25:59 2022 +0100
use more concrete types in chart2, ChartType
Change-Id: I68c04c7e3ffb21a52ad054adac7e9ed0c554e583
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128883
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index fabb4235d796..431bc452e71e 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -61,14 +61,6 @@ namespace
{
constexpr OUStringLiteral lcl_aLabelRole( u"label" );
-struct lcl_ChartTypeToSeriesCnt
-{
-Reference< XDataSeriesContainer > operator() (
-const Reference< XChartType > & xChartType )
-{
-return Reference< XDataSeriesContainer >::query( xChartType );
-}
-};
OUString lcl_ConvertRole( const OUString & rRoleString )
{
@@ -130,53 +122,6 @@ lcl_tRoleIndexMap lcl_createRoleIndexMap()
return aMap;
}
-struct lcl_DataSeriesContainerAppend
-{
-typedef Reference< XDataSeriesContainer > value_type;
-typedef std::vector< ::chart::DialogModel::tSeriesWithChartTypeByName >
tContainerType;
-
-explicit lcl_DataSeriesContainerAppend( tContainerType * rCnt )
-: m_rDestCnt( rCnt )
-{}
-
-lcl_DataSeriesContainerAppend & operator= ( const value_type & xVal )
-{
-try
-{
-if( xVal.is())
-{
-const Sequence< Reference< XDataSeries > > aSeq(
xVal->getDataSeries());
-OUString aRole( "values-y" );
-Reference< XChartType > xCT( xVal, uno::UNO_QUERY );
-if( xCT.is())
-aRole = xCT->getRoleOfSequenceForSeriesLabel();
-for( Reference< XDataSeries > const & dataSeries : aSeq )
-{
-m_rDestCnt->push_back(
-::chart::DialogModel::tSeriesWithChartTypeByName(
-::chart::DataSeriesHelper::getDataSeriesLabel(
dataSeries, aRole ),
-std::make_pair( dataSeries, xCT )));
-}
-}
-}
-catch( const uno::Exception & )
-{
-DBG_UNHANDLED_EXCEPTION("chart2");
-}
-return *this;
-}
-
-// Implement output operator requirements as required by std::copy (and
-// implement prefix increment in terms of postfix increment to avoid unused
-// member function warnings for the latter in the common case where
-// std::copy would not actually need it):
-lcl_DataSeriesContainerAppend & operator* () { return *this; }
-lcl_DataSeriesContainerAppend & operator++ (){ return operator++(0); }
-lcl_DataSeriesContainerAppend & operator++ (int) { return *this; }
-
-private:
-tContainerType * m_rDestCnt;
-};
struct lcl_RolesWithRangeAppend
{
@@ -242,13 +187,6 @@ private:
namespace std
{
-template<> struct iterator_traits
-{
-typedef std::output_iterator_tag iterator_category;
-typedef Reference< XDataSeriesContainer > value_type;
-typedef value_type& reference;
-};
-
template<> struct iterator_traits
{
typedef std::output_iterator_tag iterator_category;
@@ -465,10 +403,10 @@ Reference< data::XDataProvider >
DialogModel::getDataProvider() const
return xResult;
}
-std::vector< Reference< XDataSeriesContainer > >
+std::vector< rtl::Reference< ChartType > >
DialogModel::getAllDataSeriesContainers() const
{
-std::vector< Reference< XDataSeriesContainer > > aResult;
+std::vector< rtl::Reference< ChartType > > aResult;
try
{
@@ -481,11 +419,9 @@ std::vector< Reference< XDataSeriesContainer > >
xDiagram->getBaseCoordinateSystems());
for( rtl::Reference< BaseCoordinateSystem > const & coords :
aCooSysSeq )
{
-const Sequence< Reference< XChartType > > aChartTypeSeq(
coords->getChartTypes());
-std::transform(
-aChartTypeSeq.begin(), aChartTypeSeq.end(),
-std::back_inserter( aResult ),
-lcl_ChartTypeToSeriesCnt() );
+
+for (const auto & rxChartType : coords->getChartTypes2())
+aResult.push_back(rxChartType);
}
}
}
@@ -501,11 +437,29 @@ std::vector< DialogModel::tSeriesWithChartTypeByName >
DialogModel::getAllDataSeriesWithLa
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/DataBrowser.cxx |9 -
chart2/source/controller/dialogs/DataBrowserModel.cxx | 160 --
chart2/source/controller/dialogs/DataBrowserModel.hxx |5
chart2/source/view/inc/VDataSeries.hxx|3
chart2/source/view/main/VDataSeries.cxx |3
5 files changed, 90 insertions(+), 90 deletions(-)
New commits:
commit d48530c535574a827d7261ae8d9d1068fd53c5aa
Author: Noel Grandin
AuthorDate: Mon Jan 24 19:22:28 2022 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 25 16:25:41 2022 +0100
use more concrete types in chart2, ChartType
Change-Id: I5efd85ac51fbb8bd3cd9a9d2e07b345782d0fdc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128882
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 0fc400b740c9..1df9535a5713 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
@@ -171,7 +172,7 @@ public:
void SetColor( const Color & rCol );
void SetPos();
void SetWidth( sal_Int32 nWidth );
-void SetChartType( const Reference< chart2::XChartType > & xChartType,
+void SetChartType( const rtl::Reference< ::chart::ChartType > & xChartType,
bool bSwapXAndYAxis );
void SetSeriesName( const OUString & rName );
void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol );
@@ -223,7 +224,7 @@ private:
DECL_LINK( SeriesNameEdited, SeriesHeaderEdit&, void );
static OUString GetChartTypeImage(
-const Reference< chart2::XChartType > & xChartType,
+const rtl::Reference< ::chart::ChartType > & xChartType,
bool bSwapXAndYAxis
);
@@ -324,7 +325,7 @@ void SeriesHeader::SetPixelWidth( sal_Int32 nWidth )
}
void SeriesHeader::SetChartType(
-const Reference< chart2::XChartType > & xChartType,
+const rtl::Reference< ChartType > & xChartType,
bool bSwapXAndYAxis
)
{
@@ -382,7 +383,7 @@ bool SeriesHeader::HasFocus() const
}
OUString SeriesHeader::GetChartTypeImage(
-const Reference< chart2::XChartType > & xChartType,
+const rtl::Reference< ChartType > & xChartType,
bool bSwapXAndYAxis
)
{
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 0455adf3212f..6171c1c87242 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -464,8 +464,7 @@ void
DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu
return;
}
-Reference xSeriesCnt(
-getHeaderForSeries(xSeries).m_xChartType, uno::UNO_QUERY);
+rtl::Reference
xSeriesCnt(getHeaderForSeries(xSeries).m_xChartType);
if (!xSeriesCnt.is())
{
// Unexpected happened. Bail out.
@@ -804,101 +803,98 @@ void DataBrowserModel::updateFromModel()
const std::vector< rtl::Reference< BaseCoordinateSystem > > aCooSysSeq(
xDiagram->getBaseCoordinateSystems());
for( rtl::Reference< BaseCoordinateSystem > const & coords : aCooSysSeq )
{
-const Sequence< Reference< chart2::XChartType > > aChartTypes(
coords->getChartTypes());
+const std::vector< rtl::Reference< ChartType > > aChartTypes(
coords->getChartTypes2());
sal_Int32 nXAxisNumberFormat =
DataSeriesHelper::getNumberFormatKeyFromAxis( nullptr, coords, 0, 0 );
-for( sal_Int32 nCTIdx=0; nCTIdx(aChartTypes.size()); ++nCTIdx )
{
-Reference< chart2::XDataSeriesContainer > xSeriesCnt(
aChartTypes[nCTIdx], uno::UNO_QUERY );
-if( xSeriesCnt.is())
-{
-OUString aRoleForDataLabelNumberFormat =
ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection(
aChartTypes[nCTIdx] );
+rtl::Reference< ChartType > xSeriesCnt( aChartTypes[nCTIdx] );
+OUString aRoleForDataLabelNumberFormat =
ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection(
aChartTypes[nCTIdx] );
-const Sequence< Reference< chart2::XDataSeries > > aSeries(
xSeriesCnt->getDataSeries());
-lcl_tSharedSeqVec aSharedSequences( lcl_getSharedSequences(
aSeries ));
-for (auto const& sharedSequence : aSharedSequences)
-{
-tDataColumn aSharedSequence;
-aSharedSequence.m_xLabeledDataSequence = sharedSequence;
-aSharedSequence.m_aUIRoleName =
lcl_getUIRoleName(sharedSequence);
-aSharedSequence.m_eCellType = NUMBER;
-// as the sequences are shared it should be ok to take the
first series
-// @todo: dimension index 0 for x-values used here.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/qt5
vcl/qt5/QtFilePicker.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4eccf0c4bd3e7c48352417745d7f00b9c2ff44da
Author: Michael Weghorn
AuthorDate: Tue Jan 25 12:28:25 2022 +0100
Commit: Xisco Fauli
CommitDate: Tue Jan 25 16:25:31 2022 +0100
tdf#146941 qt: QtFilePicker::finished needs SolarMutexGuard
Change-Id: I4165c72ddd6370c8fe7faf55f9db831359f6f8a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128923
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit a85908f507f39c88a6cf244f5f4120361ad5e2ae)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128826
Reviewed-by: Xisco Fauli
diff --git a/vcl/qt5/QtFilePicker.cxx b/vcl/qt5/QtFilePicker.cxx
index 3fae63fca74f..8da6e29cc216 100644
--- a/vcl/qt5/QtFilePicker.cxx
+++ b/vcl/qt5/QtFilePicker.cxx
@@ -187,6 +187,7 @@ void QtFilePicker::prepareExecute()
void QtFilePicker::finished(int nResult)
{
+SolarMutexGuard g;
uno::Reference
xDesktop(css::frame::Desktop::create(m_context),
UNO_QUERY_THROW);
xDesktop->removeTerminateListener(this);
[Libreoffice-commits] core.git: bin/ui-rules-enforcer.py svx/uiconfig
bin/ui-rules-enforcer.py | 17 +
svx/uiconfig/ui/absrecbox.ui |2 --
svx/uiconfig/ui/navigationbar.ui |1 -
3 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 933464ad3cfc8af141d1035afbebdcceb6814bb7
Author: Caolán McNamara
AuthorDate: Tue Jan 25 14:13:44 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 16:24:17 2022 +0100
gtk4: deprecated GtkEntry shadow_type was removed
Change-Id: I378db5406c508e3672927905735449a3a1003e3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128928
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/bin/ui-rules-enforcer.py b/bin/ui-rules-enforcer.py
index c571e9748973..6fec6293244e 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -258,6 +258,22 @@ def remove_spin_button_max_length(current):
if max_length != None:
current.remove(max_length)
+def remove_entry_shadow_type(current):
+ shadow_type = None
+ isentry = current.get('class') == "GtkEntry"
+ for child in current:
+remove_entry_shadow_type(child)
+if not isentry:
+continue
+if child.tag == "property":
+ attributes = child.attrib
+ if attributes.get("name") == "shadow_type" or attributes.get("name") ==
"shadow-type":
+shadow_type = child
+
+ if isentry:
+if shadow_type!= None:
+ current.remove(shadow_type)
+
def remove_label_pad(current):
xpad = None
ypad = None
@@ -565,6 +581,7 @@ remove_expander_spacing(root)
enforce_menubutton_indicator_consistency(root)
enforce_active_in_group_consistency(root)
enforce_entry_text_column_id_column_for_gtkcombobox(root)
+remove_entry_shadow_type(root)
remove_double_buffered(root)
remove_skip_pager_hint(root)
remove_toolbutton_focus(root)
diff --git a/svx/uiconfig/ui/absrecbox.ui b/svx/uiconfig/ui/absrecbox.ui
index 635c39bff6da..2062570afdbf 100644
--- a/svx/uiconfig/ui/absrecbox.ui
+++ b/svx/uiconfig/ui/absrecbox.ui
@@ -16,7 +16,6 @@
True
4
True
-none
False
@@ -33,7 +32,6 @@
False
4
True
-none
False
diff --git a/svx/uiconfig/ui/navigationbar.ui b/svx/uiconfig/ui/navigationbar.ui
index 7810a763b27a..86fd015ab925 100644
--- a/svx/uiconfig/ui/navigationbar.ui
+++ b/svx/uiconfig/ui/navigationbar.ui
@@ -72,7 +72,6 @@
4
0.5
True
-none
False
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter2.cxx | 46 +++
sw/source/uibase/dochdl/swdtflvr.cxx | 31 +--
2 files changed, 69 insertions(+), 8 deletions(-)
New commits:
commit e16d7e193313d2e479aed3536f564649313eff5e
Author: László Németh
AuthorDate: Mon Jan 24 17:37:09 2022 +0100
Commit: László Németh
CommitDate: Tue Jan 25 16:14:43 2022 +0100
tdf#146967 sw table: fix freezing in Hide Changes mode
During change tracking, drag & drop or Cut & Paste a
table row resulted freezing in Hide Changes mode.
Test: In Hide Changes mode, select a table row by
clicking on their left border, and drag & drop or
Cut & Paste it in a different table row.
Regression from commit 5a1c19624eda0c8b847af0dcee70b82502578ceb.
Follow-up to commit 5a1c19624eda0c8b847af0dcee70b82502578ceb
tdf#146965 sw track changes: fix tracked table row moving
Change-Id: Iab606ce036fedcc70e42638e3ccf804c9dbca064
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128875
Tested-by: László Németh
Reviewed-by: László Németh
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128922
Tested-by: Jenkins
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index c0c5c9f103e7..fea93243bdc8 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -5110,6 +5110,52 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testPasteTrackedTableRow)
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testPasteTrackedTableRowInHideChangesMode)
+{
+// load a 1-row table
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf118311.fodt");
+
+// turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+ pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE("redlines should be invisible",
+ !IDocumentRedlineAccess::IsShowChanges(
+
pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// check table count
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+
+// check table row count
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+
+// copy table row and paste it by Paste Special->Rows Above
+dispatchCommand(mxComponent, ".uno:SelectTable", {});
+dispatchCommand(mxComponent, ".uno:Copy", {});
+dispatchCommand(mxComponent, ".uno:Escape", {});
+
+// This resulted freezing
+dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {});
+
+// 2-row table
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+
+// This was 2 (inserted as a nested table in the first cell of the new row)
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+dispatchCommand(mxComponent, ".uno:Undo", {});
+dispatchCommand(mxComponent, ".uno:Undo", {}); // FIXME Why 3 Undos?
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf145091)
{
// load a deleted table, reject them, and delete only its text and export
to DOCX
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 90ca0e8902ac..ea95471b8a59 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1626,8 +1626,8 @@ bool SwTransferable::Paste(SwWrtShell& rSh,
TransferableDataHelper& rData, RndSt
bool bResult = SwTransferable::PasteData( rData, rSh, nAction,
nActionFlags, nFormat,
nDestination, false, false, nullptr,
0, false, nAnchorType, bIgnoreComments, &aPasteContext );
-// set tracked insertion
-if ( eOld & RedlineFlags::On )
+// set tracked insertion, if it's not in a drag & drop action
+if ( !rSh.ActionPend() && ( eOld & RedlineFlags::On) )
{
SvxPrintItem aTracked(RES_PRINT, false);
rSh.GetDoc()->SetRowNotTracked( *rSh.GetCursor(), aTracked );
@@ -3932,6 +3932,11 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const
Point& rDragPt,
{
bool bTableCol(SelectionType::TableCol & nSelection);
+::sw::mark::IMark* pMarkMoveFrom
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter2.cxx | 47 +++
sw/source/uibase/dochdl/swdtflvr.cxx | 17
2 files changed, 64 insertions(+)
New commits:
commit 8aab37daf004ed31c67f21a352fba95ab1229086
Author: László Németh
AuthorDate: Fri Jan 21 11:13:27 2022 +0100
Commit: László Németh
CommitDate: Tue Jan 25 16:13:34 2022 +0100
tdf#146965 sw track changes: fix tracked table row moving
During track changes, drag & drop or Cut & Paste
a table row resulted a nested table in the first cell of
the newly inserted empty table row instead of moving
the original table row.
Test: select a table row by clicking on their left border,
and drag & drop or Cut & Paste it in a different
table row.
Note: This fixes crashing at Redo of tracked table row
insertion, too.
Regression from commit dbc82c02eb24ec1c97c6ee32069771d8deb394f9
"tdf#143358 sw: track insertion of empty table rows".
Change-Id: I9a31cae2c0e6e5e05450336a1e5b8d792035df35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128726
Tested-by: László Németh
Reviewed-by: László Németh
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128921
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index abb6d02556f8..c0c5c9f103e7 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -5063,6 +5063,53 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testTdf145089_RedlineTableRowInsertionDOCX
assertXPath(pXmlDoc, "//page[1]//body/tab/row", 1);
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testPasteTrackedTableRow)
+{
+// load a 1-row table
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf118311.fodt");
+
+// turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On |
RedlineFlags::ShowDelete
+ |
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+ pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// check table count
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+
+// check table row count
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+
+// copy table row and paste it by Paste Special->Rows Above
+dispatchCommand(mxComponent, ".uno:SelectTable", {});
+dispatchCommand(mxComponent, ".uno:Copy", {});
+dispatchCommand(mxComponent, ".uno:Escape", {});
+dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {});
+
+// 2-row table
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+
+// This was 2 (inserted as a nested table in the first cell of the new row)
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+
+// Is it a tracked row insertion? Its rejection results the original 1-row
table
+dispatchCommand(mxComponent, ".uno:RejectAllTrackedChanges", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf145091)
{
// load a deleted table, reject them, and delete only its text and export
to DOCX
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index a7a11bbb99f7..90ca0e8902ac 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -109,6 +109,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1598,6 +1599,12 @@ bool SwTransferable::Paste(SwWrtShell& rSh,
TransferableDataHelper& rData, RndSt
IDocumentMarkAccess::MarkType::UNO_BOOKMARK );
// add a new empty row/column before the actual table row/column
and go there
+// (without setting the rows to tracked table row insertion here,
do that at the end
+// to avoid layout problems and unnecessary insertion of dummy
characters for empty rows)
+RedlineFlags eOld =
rSh.GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags();
+if ( eOld & RedlineFlags::On )
+rSh.GetDoc()->getIDocumentRedlineAccess().SetRedlin
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
| 22 ++
writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
|binary
writerfilter/source/dmapper/GraphicImport.cxx
|7 +++
3 files changed, 29 insertions(+)
New commits:
commit 5225a8d7febfc51982242511d557c59478bebb67
Author: Miklos Vajna
AuthorDate: Mon Jan 24 12:53:25 2022 +0100
Commit: Xisco Fauli
CommitDate: Tue Jan 25 16:06:30 2022 +0100
DOCX import: fix with
If wrap is set to none ("in front of text"), then ignores layoutInCell="1" in Word. But in case
relativeFrom is something else (e.g. page) or wrap is not none, then the
old behavior is OK.
Adjust our import so that Writer's layout also allows this shape to
leave the cell.
Change-Id: I6ca7511d46d7a70df11a65dc67c182f4fff4ae69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128862
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit e993638d5ecd33783f2eebdccfa87a81e5a8a2c5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128824
Reviewed-by: Xisco Fauli
diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
index edd6e02ff8ea..2f9faefab55f 100644
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
@@ -366,6 +366,28 @@ CPPUNIT_TEST_FIXTURE(Test, testTextboxTextlineTop)
sal_Int16 nExpectedOrient = text::VertOrientation::BOTTOM;
CPPUNIT_ASSERT_EQUAL(nExpectedOrient, nActualOrient);
}
+
+CPPUNIT_TEST_FIXTURE(Test, testLayoutInCellWrapnoneColumn)
+{
+// Given a file with a table, then a shape anchored inside the cell:
+OUString aURL
+= m_directories.getURLFromSrc(DATA_DIRECTORY) +
"layout-in-cell-wrapnone-column.docx";
+
+// When loading that document:
+getComponent() = loadFromDesktop(aURL);
+
+// Then make sure the shape can leave the cell:
+uno::Reference
xDrawPageSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference xDrawPage =
xDrawPageSupplier->getDrawPage();
+uno::Reference xShape(xDrawPage->getByIndex(1),
uno::UNO_QUERY);
+uno::Reference xNamedShape(xShape, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Text Box 1"), xNamedShape->getName());
+bool bFollowingTextFlow = true;
+// Without the accompanying fix in place, this test would have failed, the
shape was not allowed
+// to leave the cell, leading to incorrect layout.
+CPPUNIT_ASSERT(xShape->getPropertyValue("IsFollowingTextFlow") >>=
bFollowingTextFlow);
+CPPUNIT_ASSERT(!bFollowingTextFlow);
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
b/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
new file mode 100644
index ..d88761421154
Binary files /dev/null and
b/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
differ
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 704774ec504a..bb3b2077e4aa 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1228,6 +1228,13 @@ void GraphicImport::lcl_attribute(Id nName, Value&
rValue)
// But they aren't Writer pictures, either (which are
already handled above).
uno::Reference< beans::XPropertySet >
xShapeProps(m_xShape, uno::UNO_QUERY_THROW);
+if (m_pImpl->nWrap == text::WrapTextMode_THROUGH &&
m_pImpl->nHoriRelation == text::RelOrientation::FRAME)
+{
+// text::RelOrientation::FRAME is OOXML's
"column", which behaves as if
+// layout-in-cell would be always off.
+m_pImpl->bLayoutInCell = false;
+}
+
// Anchored: Word only supports at-char in that case.
text::TextContentAnchorType eAnchorType =
text::TextContentAnchorType_AT_CHARACTER;
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/basedlgs.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit 142de90574ddb307f89e7595c7444cab5a7f49d9
Author: Caolán McNamara
AuthorDate: Tue Jan 25 12:56:23 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 15:25:03 2022 +0100
drop stray fprintfs
Change-Id: I690df81054aa56209b0bfded742481c2f8c06feb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128926
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index fb99335c5265..2fefb02ff125 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -77,8 +77,6 @@
SfxModelessDialogController::SfxModelessDialogController(SfxBindings* pBindinx,
const OString& rID)
: SfxDialogController(pParent, rUIXMLDescription, rID)
{
-fprintf(stderr, "SfxModelessDialogController ctor %p\n", this);
-
Init(pBindinx, pCW);
}
@@ -135,8 +133,6 @@ void SfxModelessDialogController::Deactivate()
SfxModelessDialogController::~SfxModelessDialogController()
{
-fprintf(stderr, "SfxModelessDialogController dtor %p\n", this);
-
if (!m_xImpl->pMgr)
return;
auto xFrame = m_xImpl->pMgr->GetFrame();
@@ -217,7 +213,6 @@ SfxDialogController::SfxDialogController(weld::Widget*
pParent, const OUString&
void SfxDialogController::Close()
{
-fprintf(stderr, "really closing\n");
// tdf3146571 ignore focus changes after we've closed
m_xDialog->connect_container_focus_changed(Link());
}
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbcontrl.cxx | 104 +--
1 file changed, 79 insertions(+), 25 deletions(-)
New commits:
commit adbaec38eca4847915871c817b67f5c722f0997d
Author: Bayram Çiçek
AuthorDate: Sun Jan 16 20:47:42 2022 +0300
Commit: Heiko Tietze
CommitDate: Tue Jan 25 15:07:36 2022 +0100
tdf#146407: Hide diagonal border icons for Writer
- Writer and Calc use the same 'Borders' UI.
- svx/source/tbxctrls/tbcontrl.cxx
- Diagonal borders for Writer has not been implemented yet.
Therefore, diagonal borders don't work when clicking on them.
- It would be convenient to hide diagonal border
icons until the functionality is implemented.
Change-Id: I6601ef924dbfb0acd40c3144300fecf74922c49f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128487
Tested-by: Jenkins
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3f2c8f8b634a..e7f168fc9340 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -457,6 +457,7 @@ private:
std::unique_ptr mxFrameSetWin;
std::vector> aImgVec;
boolbParagraphMode;
+boolm_bIsWriter;
void InitImageList();
void CalcSizeValueSet();
@@ -2177,7 +2178,13 @@
SvxFrameWindow_Impl::SvxFrameWindow_Impl(SvxFrameToolBoxControl* pControl, weld:
, mxFrameSet(new SvxFrmValueSet_Impl)
, mxFrameSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxFrameSet))
, bParagraphMode(false)
+, m_bIsWriter(false)
{
+
+// check whether the document is Writer or not
+if (Reference xSI{
m_xFrame->getController()->getModel(), UNO_QUERY })
+m_bIsWriter = xSI->supportsService("com.sun.star.text.TextDocument");
+
mxFrameSet->SetStyle(WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK |
WB_NO_DIRECTSELECT);
AddStatusListener(".uno:BorderReducedMode");
InitImageList();
@@ -2193,15 +2200,22 @@
SvxFrameWindow_Impl::SvxFrameWindow_Impl(SvxFrameToolBoxControl* pControl, weld:
sal_uInt16 i = 0;
-for ( i=1; i<11; i++ )
+// diagonal borders available only for Calc.
+// Therefore, Calc uses 10 border types while
+// Writer uses 8 of them - for a single cell.
+for ( i=1; i < (m_bIsWriter ? 9 : 11); i++ )
mxFrameSet->InsertItem(i, Image(aImgVec[i-1].first),
aImgVec[i-1].second);
//bParagraphMode should have been set in StateChanged
if ( !bParagraphMode )
-for ( i = 11; i < 16; i++ )
+// when multiple cell selected:
+// Writer has 12 border types and Calc has 15 of them.
+for ( i = (m_bIsWriter ? 9 : 11); i < (m_bIsWriter ? 13 : 16); i++ )
mxFrameSet->InsertItem(i, Image(aImgVec[i-1].first),
aImgVec[i-1].second);
-mxFrameSet->SetColCount( 5 );
+// adjust frame column for Writer
+sal_uInt16 colCount = m_bIsWriter ? 4 : 5;
+mxFrameSet->SetColCount( colCount );
mxFrameSet->SetSelectHdl( LINK( this, SvxFrameWindow_Impl, SelectHdl ) );
CalcSizeValueSet();
@@ -2259,6 +2273,17 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl,
ValueSet*, void)
// cell border using the border formatting tool in the standard toolbar
theDefLine.GuessLinesWidths(theDefLine.GetBorderLineStyle(),
SvxBorderLineWidth::Thin);
+// nSel has 15 cases which means 15 border
+// types for Calc. But Writer uses only 12
+// of them - when diagonal borders excluded.
+if (m_bIsWriter)
+{
+// add appropriate increments
+// to match the correct borders.
+if (nSel > 8) { nSel += 2; }
+else if (nSel > 4) { nSel++; }
+}
+
switch ( nSel )
{
case 1: nValidFlags |= FrmValidFlags::AllMask;
@@ -2416,18 +2441,19 @@ void SvxFrameWindow_Impl::statusChanged( const
css::frame::FeatureStateEvent& rE
if(!mxFrameSet->GetItemCount())
return;
-bool bTableMode = ( mxFrameSet->GetItemCount() == 15 );
+// set 12 border types for Writer, otherwise 15 for Calc.
+bool bTableMode = ( mxFrameSet->GetItemCount() ==
static_cast(m_bIsWriter ? 12 : 15) );
bool bResize= false;
if ( bTableMode && bParagraphMode )
{
-for ( sal_uInt16 i = 11; i < 16; i++ )
+for ( sal_uInt16 i = (m_bIsWriter ? 9 : 11); i < (m_bIsWriter ? 13 :
16); i++ )
mxFrameSet->RemoveItem(i);
bResize = true;
}
else if ( !bTableMode && !bParagraphMode )
{
-for ( sal_uInt16 i = 11; i < 16; i++ )
+for ( sal_uInt16 i = (m_bIsWriter ? 9 : 11); i < (m_bIsWriter ? 13 :
16); i++ )
mxFrameSet->InsertItem(i, Image(aImgVec[i-1].first),
aImgVec[i-1].second);
bResize = true;
}
@@ -2450,25 +2476,53 @@ void SvxFrameWindow_Impl::CalcSizeValueSet()
void SvxFrameWindow_Impl::InitImageList()
{
-aImgVec = {
-{BitmapEx(RID_SV
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/QtFilePicker.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a85908f507f39c88a6cf244f5f4120361ad5e2ae
Author: Michael Weghorn
AuthorDate: Tue Jan 25 12:28:25 2022 +0100
Commit: Michael Weghorn
CommitDate: Tue Jan 25 15:01:41 2022 +0100
tdf#146941 qt: QtFilePicker::finished needs SolarMutexGuard
Change-Id: I4165c72ddd6370c8fe7faf55f9db831359f6f8a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128923
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtFilePicker.cxx b/vcl/qt5/QtFilePicker.cxx
index 05682fa1e7bf..42caf06149f0 100644
--- a/vcl/qt5/QtFilePicker.cxx
+++ b/vcl/qt5/QtFilePicker.cxx
@@ -187,6 +187,7 @@ void QtFilePicker::prepareExecute()
void QtFilePicker::finished(int nResult)
{
+SolarMutexGuard g;
uno::Reference
xDesktop(css::frame::Desktop::create(m_context),
UNO_QUERY_THROW);
xDesktop->removeTerminateListener(this);
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/dlg_InsertTitle.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit ddf7e388f2e45dbbe4e1f90610373dea530a425f
Author: Noel Grandin
AuthorDate: Tue Jan 25 11:40:07 2022 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 25 14:10:16 2022 +0100
extra include needed for UBSAN
Change-Id: I7a5125947bac0ff657a98fda9cdc34f188d0f5d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128913
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 03f942945823..b5428f234d57 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
namespace chart
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - include/sfx2 sc/source sfx2/source
include/sfx2/basedlgs.hxx|2 +-
sc/source/ui/dbgui/PivotLayoutDialog.cxx |3 ++-
sfx2/source/dialog/basedlgs.cxx |7 +++
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 7c1ca3b3916b3216188cdb32852cb2058cf070f3
Author: Caolán McNamara
AuthorDate: Mon Jan 24 15:46:50 2022 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Jan 25 13:46:10 2022 +0100
tdf#146571 Ignore focus changes after closing Manage changes dialog
Change-Id: Ib588310410a265acdd129a8e51adf56bb5973bd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128869
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128910
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index c8c1bdad8a40..84a3da9b1ed0 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -49,7 +49,7 @@ public:
// when the dialog has an associated SfxChildWin, typically for Modeless
interaction
virtual void ChildWinDispose() {} // called from the associated
SfxChildWin dtor
-virtual void Close() {} // called by the SfxChildWin when the dialog is
closed
+virtual void Close(); // called by the SfxChildWin when the dialog is
closed
virtual void EndDialog(); // called by the SfxChildWin to close the dialog
};
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 05a9428eda5e..3ea7e0121eb0 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -627,7 +627,8 @@ void
ScPivotLayoutDialog::PushDataFieldNames(std::vector& rDataFieldNa
void ScPivotLayoutDialog::Close()
{
-DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
+DoClose(ScPivotLayoutWrapper::GetChildWindowId());
+SfxDialogController::Close();
}
IMPL_LINK_NOARG( ScPivotLayoutDialog, OKClicked, weld::Button&, void )
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index f28d31d7882d..7cdd782e120c 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -197,6 +197,7 @@ void SfxModelessDialogController::Close()
m_pBindings->GetDispatcher_Impl()->ExecuteList(
m_xImpl->pMgr->GetType(),
SfxCallMode::RECORD|SfxCallMode::SYNCHRON, { &aValue } );
+SfxDialogController::Close();
}
SfxDialogController::SfxDialogController(weld::Widget* pParent, const
OUString& rUIFile,
@@ -210,6 +211,12 @@ SfxDialogController::SfxDialogController(weld::Widget*
pParent, const OUString&
m_xDialog->connect_container_focus_changed(LINK(this, SfxDialogController,
FocusChangeHdl));
}
+void SfxDialogController::Close()
+{
+// tdf3146571 ignore focus changes after we've closed
+m_xDialog->connect_container_focus_changed(Link());
+}
+
IMPL_STATIC_LINK_NOARG(SfxDialogController, InstallLOKNotifierHdl, void*,
vcl::ILibreOfficeKitNotifier*)
{
return SfxViewShell::Current();
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/PivotLayoutDialog.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b7712be56515ef48cef5ed084f46e355d818d941
Author: Caolán McNamara
AuthorDate: Tue Jan 25 09:03:23 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 13:33:31 2022 +0100
call baseclass Close
Change-Id: I661b4fe839a01f3929119540eb3bd1065f5fdbf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128917
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index eca43615618c..9244a4d7e3e5 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -627,7 +627,8 @@ void
ScPivotLayoutDialog::PushDataFieldNames(std::vector& rDataFieldNa
void ScPivotLayoutDialog::Close()
{
-DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
+DoClose(ScPivotLayoutWrapper::GetChildWindowId());
+SfxDialogController::Close();
}
IMPL_LINK_NOARG( ScPivotLayoutDialog, OKClicked, weld::Button&, void )
[Libreoffice-commits] core.git: basctl/uiconfig bin/ui-rules-enforcer.py cui/uiconfig desktop/uiconfig extensions/uiconfig filter/uiconfig sc/uiconfig sd/uiconfig sfx2/source sfx2/uiconfig svtools/uic
basctl/uiconfig/basicide/ui/basicmacrodialog.ui|2 +- basctl/uiconfig/basicide/ui/dialogpage.ui |4 ++-- basctl/uiconfig/basicide/ui/importlibdialog.ui |2 +- basctl/uiconfig/basicide/ui/libpage.ui |4 ++-- basctl/uiconfig/basicide/ui/modulepage.ui |4 ++-- bin/ui-rules-enforcer.py | 10 ++ cui/uiconfig/ui/accelconfigpage.ui |6 +++--- cui/uiconfig/ui/acorexceptpage.ui |6 +++--- cui/uiconfig/ui/colorpickerdialog.ui |2 +- cui/uiconfig/ui/databaselinkdialog.ui |2 +- cui/uiconfig/ui/eventassignpage.ui |2 +- cui/uiconfig/ui/eventsconfigpage.ui|2 +- cui/uiconfig/ui/fmsearchdialog.ui |2 +- cui/uiconfig/ui/iconselectordialog.ui |2 +- cui/uiconfig/ui/menuassignpage.ui |4 ++-- cui/uiconfig/ui/optaccessibilitypage.ui| 10 +- cui/uiconfig/ui/optadvancedpage.ui | 11 +++ cui/uiconfig/ui/optappearancepage.ui |2 +- cui/uiconfig/ui/optctlpage.ui |2 +- cui/uiconfig/ui/optfltrembedpage.ui|8 cui/uiconfig/ui/optfltrpage.ui | 12 ++-- cui/uiconfig/ui/optgeneralpage.ui |2 +- cui/uiconfig/ui/opthtmlpage.ui |6 +++--- cui/uiconfig/ui/optlanguagespage.ui|6 +++--- cui/uiconfig/ui/optonlineupdatepage.ui |4 ++-- cui/uiconfig/ui/optpathspage.ui|2 +- cui/uiconfig/ui/optsavepage.ui |6 +++--- cui/uiconfig/ui/optsecuritypage.ui |2 +- cui/uiconfig/ui/pickoutlinepage.ui |2 +- cui/uiconfig/ui/spellingdialog.ui |2 +- cui/uiconfig/ui/textanimtabpage.ui |2 +- cui/uiconfig/ui/wordcompletionpage.ui |4 ++-- cui/uiconfig/ui/zoomdialog.ui |2 +- desktop/uiconfig/ui/extensionmanager.ui|2 +- extensions/uiconfig/sabpilot/ui/datasourcepage.ui |2 +- extensions/uiconfig/sabpilot/ui/selecttablepage.ui |4 ++-- extensions/uiconfig/sabpilot/ui/selecttypepage.ui |4 ++-- filter/uiconfig/ui/pdfgeneralpage.ui |2 +- filter/uiconfig/ui/xmlfiltertabpagegeneral.ui |2 +- sc/uiconfig/scalc/ui/optcalculatepage.ui |2 +- sc/uiconfig/scalc/ui/optcompatibilitypage.ui |2 +- sc/uiconfig/scalc/ui/optformula.ui |2 +- sc/uiconfig/scalc/ui/selectsource.ui |4 ++-- sc/uiconfig/scalc/ui/sortoptionspage.ui|2 +- sc/uiconfig/scalc/ui/subtotaloptionspage.ui|4 ++-- sc/uiconfig/scalc/ui/tpviewpage.ui |4 ++-- sd/uiconfig/sdraw/ui/vectorize.ui |2 +- sd/uiconfig/simpress/ui/interactionpage.ui |2 +- sd/uiconfig/simpress/ui/navigatorpanel.ui |2 +- sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |2 +- sd/uiconfig/simpress/ui/presentationdialog.ui |6 +++--- sd/uiconfig/simpress/ui/publishingdialog.ui|2 +- sd/uiconfig/simpress/ui/sdviewpage.ui |2 +- sfx2/source/dialog/basedlgs.cxx|5 + sfx2/uiconfig/ui/documentinfopage.ui |2 +- sfx2/uiconfig/ui/linkeditdialog.ui |2 +- sfx2/uiconfig/ui/versionsofdialog.ui |2 +- svtools/uiconfig/ui/printersetupdialog.ui |2 +- svx/uiconfig/ui/floatingcontour.ui |2 +- svx/uiconfig/ui/optgridpage.ui |2 +- sw/uiconfig/swriter/ui/conditionpage.ui|2 +- sw/uiconfig/swriter/ui/exchangedatabases.ui|2 +- sw/uiconfig/swriter/ui/footnotepage.ui |4 ++-- sw/uiconfig/swriter/ui/insertcaption.ui|2 +- sw/uiconfig/swriter/ui/optcompatpage.ui|4 ++-- sw/uiconfig/swriter/ui/optformataidspage.ui|2 +- sw/uiconfig/swriter/ui/optredlinepage.ui |6 +++--- sw/uiconfig/swriter/ui/printeroptions.ui |2 +- sw/uiconfig/swriter/ui/printoptionspage.ui |2 +- vcl/unx/gtk3/gtkinst.cxx | 10 +- 70 files changed, 124 insertions(+), 122 deletions(-) New commits: commit c7fcd5a3bdbf181817ce6e5d2067434d480287a6 Author: Caolán McNamara AuthorDate: Tue Jan 25 10:24:07 2022 + Commit: Caolán McNamara CommitDate: Tue Jan 25 13:24:23 2022 +0100 Related: tdf#146971 remove %PRODUCTNAME from accessible-description Change-Id: I83ff18c8b5e95fa172de950eb351cbfd855c9d5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128919 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/basctl/uiconfig/basici
[Libreoffice-commits] help.git: source/text
source/text/sbasic/guide/sample_code.xhp |2 +- source/text/sbasic/python/main.xhp |2 +- source/text/sbasic/python/python_dialogs.xhp |4 ++-- source/text/sbasic/python/python_locations.xhp |4 ++-- source/text/sbasic/shared/0003.xhp |4 ++-- source/text/sbasic/shared/01030400.xhp |8 source/text/sbasic/shared/03131900.xhp |4 ++-- source/text/shared/01/06130030.xhp |2 +- source/text/shared/guide/scripting.xhp | 12 ++-- source/text/swriter/guide/autotext.xhp |2 +- 10 files changed, 22 insertions(+), 22 deletions(-) New commits: commit e1da23a649197d960c8492373326e11286b3239e Author: Caolán McNamara AuthorDate: Tue Jan 25 10:30:13 2022 + Commit: Caolán McNamara CommitDate: Tue Jan 25 13:23:56 2022 +0100 Related: tdf#146971 rename %PRODUCTNAME Macros to Application Macros Change-Id: I83393ec16732482deade1694c6a1a8e2b92f3944 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128916 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/source/text/sbasic/guide/sample_code.xhp b/source/text/sbasic/guide/sample_code.xhp index 7ef8b6a45..cdb79e383 100644 --- a/source/text/sbasic/guide/sample_code.xhp +++ b/source/text/sbasic/guide/sample_code.xhp @@ -59,7 +59,7 @@ LoadDialog() = oRuntimeDialog End Function -LoadDialog function is stored in Tools.ModuleControls available from %PRODUCTNAME Macros and Dialogs. +LoadDialog function is stored in Tools.ModuleControls available from Application Macros and Dialogs. Displaying a Dialog REM global definition of variables diff --git a/source/text/sbasic/python/main.xhp b/source/text/sbasic/python/main.xhp index 76a4e2589..e84d9b2d3 100644 --- a/source/text/sbasic/python/main.xhp +++ b/source/text/sbasic/python/main.xhp @@ -30,7 +30,7 @@ You can execute Python scripts choosing Tools - Macros - Run Macro. Editing scripts can be done with your preferred text editor. Python scripts are present in various locations detailed hereafter. You can refer to Programming examples for macros illustrating how to run the Python interactive console from %PRODUCTNAME. -The %PRODUCTNAME scripting framework for Python is optional on some GNU/Linux distributions. If it is installed, selecting Tools - Macros - Run Macro and checking %PRODUCTNAME Macros for the presence of HelloWorld – HelloWorldPython macro is sufficient. If absent, please refer to your distribution documentation in order to install the %PRODUCTNAME scripting framework for Python. +The %PRODUCTNAME scripting framework for Python is optional on some GNU/Linux distributions. If it is installed, selecting Tools - Macros - Run Macro and checking Application Macros for the presence of HelloWorld – HelloWorldPython macro is sufficient. If absent, please refer to your distribution documentation in order to install the %PRODUCTNAME scripting framework for Python. diff --git a/source/text/sbasic/python/python_dialogs.xhp b/source/text/sbasic/python/python_dialogs.xhp index 844e206ad..ee6c6ee0f 100644 --- a/source/text/sbasic/python/python_dialogs.xhp +++ b/source/text/sbasic/python/python_dialogs.xhp @@ -23,8 +23,8 @@ Opening a Dialog with Python -%PRODUCTNAME static dialogs are created with the Dialog editor and are stored in varying places according to their personal (My Macros), shared (%PRODUCTNAME Macros) or document-embedded nature. In reverse, dynamic dialogs are constructed at runtime, from Basic or Python scripts, or using any other %PRODUCTNAME supported language for that matter. Opening static dialogs with Python is illustrated herewith. Exception handling and internationalization are omitted for clarity. -My Macros or %PRODUCTNAME Macros dialogs +%PRODUCTNAME static dialogs are created with the Dialog editor and are stored in varying places according to their personal (My Macros), shared (Application Macros) or document-embedded nature. In reverse, dynamic dialogs are constructed at runtime, from Basic or Python scripts, or using any other %PRODUCTNAME supported language for that matter. Opening static dialogs with Python is illustrated herewith. Exception handling and internationalization are omitted for clarity. +My Macros or Application Macros dialogs The examples below open Access2Base Trace console or the imported TutorialsDialog dialog with Tools - Macros - Run Macro menu: # -*- coding: utf-8 -*- diff --git a/source/text/sbasic/python/python_locations.xhp b/source/text/sbasic/python/python_locations.xhp index 6a5faa544..90f4c2f72 100644 --- a/source/text/sbasic/python/python_locations.xhp +++ b/source/text/sbasic/python/python_locations.xhp @@ -29,7 +29,7 @@ My Macros: personal macros available for the %PRODUCTNAME user
[Libreoffice-commits] core.git: 2 commits - basctl/inc cui/inc cui/uiconfig helpcontent2
basctl/inc/strings.hrc |6 +++---
cui/inc/strings.hrc|2 +-
cui/uiconfig/ui/scriptorganizer.ui |2 +-
helpcontent2 |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit ea09bad389ee1af19e5e626905e4d67bcc94636e
Author: Caolán McNamara
AuthorDate: Tue Jan 25 12:23:57 2022 +
Commit: Gerrit Code Review
CommitDate: Tue Jan 25 13:23:57 2022 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
to e1da23a649197d960c8492373326e11286b3239e
- Related: tdf#146971 rename %PRODUCTNAME Macros to Application Macros
Change-Id: I83393ec16732482deade1694c6a1a8e2b92f3944
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128916
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/helpcontent2 b/helpcontent2
index 798fa0b98aa4..e1da23a64919 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 798fa0b98aa4308d1082583966571d4de5f504bb
+Subproject commit e1da23a649197d960c8492373326e11286b3239e
commit be7c21cc6a8df1c06a3210f32322eab382834b72
Author: Caolán McNamara
AuthorDate: Tue Jan 25 10:33:03 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 13:23:37 2022 +0100
Related: tdf#146971 rename %PRODUCTNAME Macros to Application Macros
Change-Id: I6a11c335b28cfaeaceba93b22e7d2db30ee803db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128918
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index dafc79be914e..09190a0b895d 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -75,9 +75,9 @@
#define RID_STR_USERMACROS NC_("RID_STR_USERMACROS", "My
Macros")
#define RID_STR_USERDIALOGS NC_("RID_STR_USERDIALOGS", "My
Dialogs")
#define RID_STR_USERMACROSDIALOGS NC_("RID_STR_USERMACROSDIALOGS",
"My Macros & Dialogs")
-#define RID_STR_SHAREMACROS NC_("RID_STR_SHAREMACROS",
"%PRODUCTNAME Macros")
-#define RID_STR_SHAREDIALOGSNC_("RID_STR_SHAREDIALOGS",
"%PRODUCTNAME Dialogs")
-#define RID_STR_SHAREMACROSDIALOGS NC_("RID_STR_SHAREMACROSDIALOGS",
"%PRODUCTNAME Macros & Dialogs")
+#define RID_STR_SHAREMACROS NC_("RID_STR_SHAREMACROS",
"Application Macros")
+#define RID_STR_SHAREDIALOGSNC_("RID_STR_SHAREDIALOGS",
"Application Dialogs")
+#define RID_STR_SHAREMACROSDIALOGS NC_("RID_STR_SHAREMACROSDIALOGS",
"Application Macros & Dialogs")
#define RID_STR_REMOVEWATCHTIP NC_("RID_STR_REMOVEWATCHTIP",
"Remove Watch")
#define RID_STR_QUERYREPLACEMACRO NC_("RID_STR_QUERYREPLACEMACRO",
"Do you want to overwrite the XX macro?")
#define RID_STR_TRANSLATION_NOTLOCALIZED
NC_("RID_STR_TRANSLATION_NOTLOCALIZED", "")
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index df987aa0501e..c8c1b36fb3b1 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -84,7 +84,7 @@
#define RID_CUISTR_ALLFUNCTIONS
NC_("RID_SVXSTR_ALLFUNCTIONS", "All commands")
#define RID_CUISTR_MACROS NC_("RID_SVXSTR_MACROS",
"Macros")
#define RID_CUISTR_MYMACROS NC_("RID_SVXSTR_MYMACROS",
"My Macros")
-#define RID_CUISTR_PRODMACROS
NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros")
+#define RID_CUISTR_PRODMACROS
NC_("RID_SVXSTR_PRODMACROS", "Application Macros")
#define RID_CUISTR_NOMACRODESC
NC_("RID_SVXSTR_NOMACRODESC", "There is no description available for this
macro.")
#define RID_CUISTR_SELECTOR_RUN
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
#define RID_CUISTR_ROW NC_("RID_SVXSTR_ROW",
"Insert Rows")
diff --git a/cui/uiconfig/ui/scriptorganizer.ui
b/cui/uiconfig/ui/scriptorganizer.ui
index f30d7be537eb..2421ca93f8b5 100644
--- a/cui/uiconfig/ui/scriptorganizer.ui
+++ b/cui/uiconfig/ui/scriptorganizer.ui
@@ -263,7 +263,7 @@
-Select a macro or
script from My Macros, %PRODUCTNAME Macros, or an open document. To view the
available macros or scripts, double-click an entry.
+Select a macro or
script from My Macros, Application Macros, or an open document. To view the
available macros or scripts, double-click an entry.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 964da41e9dc95318a55cf300bb03bc6f309cb1fc Author: Jeff Huang AuthorDate: Tue Jan 25 20:01:09 2022 +0800 Commit: Gerrit Code Review CommitDate: Tue Jan 25 13:01:09 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 798fa0b98aa4308d1082583966571d4de5f504bb - tdf#139735 Change all "Link to External Data" to "External Links" According to https://bugs.documentfoundation.org/show_bug.cgi?id=139735#c4 , this patch change all of "Link to External Data" sentence to "External Links". Change-Id: I654ad8eeac76589bcd205cb8edf94c218a41 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128911 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 14cfe4926e77..798fa0b98aa4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 14cfe4926e77b4ab9bee348b391c7532c7339349 +Subproject commit 798fa0b98aa4308d1082583966571d4de5f504bb
[Libreoffice-commits] help.git: source/text
source/text/scalc/00/0404.xhp |2 +- source/text/scalc/01/0409.xhp |4 ++-- source/text/scalc/guide/cellreferences_url.xhp |2 +- source/text/scalc/guide/webquery.xhp |2 +- source/text/shared/01/0218.xhp |2 +- 5 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 798fa0b98aa4308d1082583966571d4de5f504bb Author: Jeff Huang AuthorDate: Tue Jan 25 17:15:54 2022 +0800 Commit: Olivier Hallot CommitDate: Tue Jan 25 13:01:06 2022 +0100 tdf#139735 Change all "Link to External Data" to "External Links" According to https://bugs.documentfoundation.org/show_bug.cgi?id=139735#c4 , this patch change all of "Link to External Data" sentence to "External Links". Change-Id: I654ad8eeac76589bcd205cb8edf94c218a41 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128911 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/00/0404.xhp b/source/text/scalc/00/0404.xhp index 0a889dfcc..d9873d31c 100644 --- a/source/text/scalc/00/0404.xhp +++ b/source/text/scalc/00/0404.xhp @@ -149,7 +149,7 @@ Insert - Function - Category Add-In Choose Insert - Named Range or Expression. -Choose Sheet - Link to External Data. +Choose Sheet - External Links. Choose Sheet - Named Ranges and Expressions - Define. CommandCtrl+F3 diff --git a/source/text/scalc/01/0409.xhp b/source/text/scalc/01/0409.xhp index 618a92604..e78f7a721 100644 --- a/source/text/scalc/01/0409.xhp +++ b/source/text/scalc/01/0409.xhp @@ -22,7 +22,7 @@ - Link to External Data + External Links /text/scalc/01/0409.xhp @@ -34,7 +34,7 @@ -Link to External Data +External Links Inserts data from an HTML, Calc, CSV or Excel file into the current sheet as a link. The data must be located within a named range. diff --git a/source/text/scalc/guide/cellreferences_url.xhp b/source/text/scalc/guide/cellreferences_url.xhp index 6db21a0ec..de83a313c 100644 --- a/source/text/scalc/guide/cellreferences_url.xhp +++ b/source/text/scalc/guide/cellreferences_url.xhp @@ -40,7 +40,7 @@ In a $[officename] Calc document, position the cursor in the cell into which you want to insert the external data. -Choose Sheet - Link to External Data. The External Data dialog appears. +Choose Sheet - External Links. The External Data dialog appears. Enter the URL of the document or Web page in the dialog. The URL must be in the format: http://www.my-bank.com/table.html. The URL for local or local area network files is the path seen in the File - Open dialog. diff --git a/source/text/scalc/guide/webquery.xhp b/source/text/scalc/guide/webquery.xhp index 9b729728d..c98461be3 100644 --- a/source/text/scalc/guide/webquery.xhp +++ b/source/text/scalc/guide/webquery.xhp @@ -49,7 +49,7 @@ Set the cell cursor at the cell where the new content will be inserted. -Choose Sheet - Link to External Data. This opens the External Data dialog. +Choose Sheet - External Links. This opens the External Data dialog. Enter the URL of the HTML document or the name of the spreadsheet. Press Enter when finished. Click the Browse button to open a file selection dialog.only after Enter the URL will be requested from the net. diff --git a/source/text/shared/01/0218.xhp b/source/text/shared/01/0218.xhp index f880e8c3a..a0adb2661 100644 --- a/source/text/shared/01/0218.xhp +++ b/source/text/shared/01/0218.xhp @@ -38,7 +38,7 @@ Edit Links to External Files You can change or remove each link to external files in the current document. You can also update the content of the current file to the most recently saved version of linked external file. This command does not apply to hyperlinks, and is not available if the current document does not contain links to other files. -This command can be used with external file links to sections (place cursor outside of the section), master documents,sheets linked with Sheet - Insert Sheet from File or Sheet - Link to External Data, Function WEBSERVICE, images and OLE objects (when inserted with a link to an external file). +This command can be used with external file links to sections (place cursor outside of the section), master documents,sheets linked with Sheet - Insert Sheet from File or Sheet - External Links, Function WEBSERVICE, images and OLE objects (when inserted with a link to an external file).
[Libreoffice-commits] core.git: Branch 'private/juergen/LoTest' - 0 commits -
Rebased ref, commits from common ancestor:
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter2.cxx | 46 +++
sw/source/uibase/dochdl/swdtflvr.cxx | 31 +--
2 files changed, 69 insertions(+), 8 deletions(-)
New commits:
commit 5e8aa259e48d5602b932353bb146ebb523982cf2
Author: László Németh
AuthorDate: Mon Jan 24 17:37:09 2022 +0100
Commit: László Németh
CommitDate: Tue Jan 25 12:18:23 2022 +0100
tdf#146967 sw table: fix freezing in Hide Changes mode
During change tracking, drag & drop or Cut & Paste a
table row resulted freezing in Hide Changes mode.
Test: In Hide Changes mode, select a table row by
clicking on their left border, and drag & drop or
Cut & Paste it in a different table row.
Regression from commit 5a1c19624eda0c8b847af0dcee70b82502578ceb.
Follow-up to commit 5a1c19624eda0c8b847af0dcee70b82502578ceb
tdf#146965 sw track changes: fix tracked table row moving
Change-Id: Iab606ce036fedcc70e42638e3ccf804c9dbca064
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128875
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 157891b1b363..a1fc810fafec 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -5110,6 +5110,52 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testPasteTrackedTableRow)
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testPasteTrackedTableRowInHideChangesMode)
+{
+// load a 1-row table
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf118311.fodt");
+
+// turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+ pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE("redlines should be invisible",
+ !IDocumentRedlineAccess::IsShowChanges(
+
pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// check table count
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+
+// check table row count
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+
+// copy table row and paste it by Paste Special->Rows Above
+dispatchCommand(mxComponent, ".uno:SelectTable", {});
+dispatchCommand(mxComponent, ".uno:Copy", {});
+dispatchCommand(mxComponent, ".uno:Escape", {});
+
+// This resulted freezing
+dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {});
+
+// 2-row table
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+
+// This was 2 (inserted as a nested table in the first cell of the new row)
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+dispatchCommand(mxComponent, ".uno:Undo", {});
+dispatchCommand(mxComponent, ".uno:Undo", {}); // FIXME Why 3 Undos?
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf145091)
{
// load a deleted table, reject them, and delete only its text and export
to DOCX
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index c3047586acd7..883ada5147b8 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1619,8 +1619,8 @@ bool SwTransferable::Paste(SwWrtShell& rSh,
TransferableDataHelper& rData, RndSt
bool bResult = SwTransferable::PasteData( rData, rSh, nAction,
nActionFlags, nFormat,
nDestination, false, false, nullptr,
0, false, nAnchorType, bIgnoreComments, &aPasteContext );
-// set tracked insertion
-if ( eOld & RedlineFlags::On )
+// set tracked insertion, if it's not in a drag & drop action
+if ( !rSh.ActionPend() && ( eOld & RedlineFlags::On) )
{
SvxPrintItem aTracked(RES_PRINT, false);
rSh.GetDoc()->SetRowNotTracked( *rSh.GetCursor(), aTracked );
@@ -3925,6 +3925,11 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const
Point& rDragPt,
{
bool bTableCol(SelectionType::TableCol & nSelection);
+::sw::mark::IMark* pMarkMoveFrom = rSh.SetBookmark(
+vcl::KeyCode(),
+OUString(
[Libreoffice-commits] core.git: Changes to 'private/juergen/LoTest'
New branch 'private/juergen/LoTest' available with the following commits: commit ea556e36e39f19db01b1c55fca69610d422c1843 Author: Juergen Funk Date: Tue Jan 25 12:13:52 2022 +0100 Test build for master test Change-Id: Idf90a06d125ead43117212fcf2e755514b665e2f
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit a6827c3787f3056444586979750f97d3e963f6f2
Author: Caolán McNamara
AuthorDate: Mon Jan 24 20:09:49 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 11:45:36 2022 +0100
tdf#146971 changing a11y desc to replace %PRODUCTNAME has perf issues
so leave it alone, and do the conversion just for the originally
report situation as a safely backportable change with a follow up
to not allow us to get into this situation in the first place
Change-Id: I4f95f85791d0f937e53d7541804870b2cbf62b44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128821
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 94184ca3db42..aa5b0685aa21 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21349,7 +21349,15 @@ namespace {
const char* pDesc = pAtkObject ?
atk_object_get_description(pAtkObject) : nullptr;
if (pDesc && pDesc[0])
{
-gtk_tooltip_set_text(tooltip, pDesc);
+if (ResHookProc pStringReplace =
Translate::GetReadStringHook())
+{
+// tdf#142704 %PRODUCTNAME shown in extended tips
+OUString aDesc(pDesc, strlen(pDesc),
RTL_TEXTENCODING_UTF8);
+aDesc = (*pStringReplace)(aDesc);
+gtk_tooltip_set_text(tooltip, OUStringToOString(aDesc,
RTL_TEXTENCODING_UTF8).getStr());
+}
+else
+gtk_tooltip_set_text(tooltip, pDesc);
return true;
}
#endif
@@ -21670,18 +21678,6 @@ private:
aTooltip = (*m_pStringReplace)(aTooltip);
gtk_widget_set_tooltip_text(pWidget,
OUStringToOString(aTooltip, RTL_TEXTENCODING_UTF8).getStr());
}
-
-#if !GTK_CHECK_VERSION(4, 0, 0)
-// tdf#142704 %PRODUCTNAME shown in extended tips
-AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget);
-const char* pDesc = pAtkObject ?
atk_object_get_description(pAtkObject) : nullptr;
-if (pDesc && pDesc[0])
-{
-OUString aDesc(pDesc, strlen(pDesc), RTL_TEXTENCODING_UTF8);
-aDesc = (*m_pStringReplace)(aDesc);
-atk_object_set_description(pAtkObject,
OUStringToOString(aDesc, RTL_TEXTENCODING_UTF8).getStr());
-}
-#endif
}
// expand placeholder and collect potentially missing mnemonics
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source
vcl/source/app/salvtables.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 43f33aabe7417a9ce00576c83360c47fcdaa217b
Author: Szymon Kłos
AuthorDate: Mon Jan 24 14:16:31 2022 +0100
Commit: Szymon Kłos
CommitDate: Tue Jan 25 10:38:39 2022 +0100
lok: use focused tab page help
When we open dialog with tab pages, help should open
website for corresponding tab.
Use focused window - but not global which can be modified
by other view in lok case.
followup for:
commit 70f2fc7a10f41204e353bd3487377983a1018b53
lok: don't use focus window to request help
Change-Id: Ib7544a91696ce2f2c8ab01e62a47d279d2c5c655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128863
Reviewed-by: Mert Tumer
Tested-by: Jenkins CollaboraOffice
(cherry picked from commit 62e1cacb90ad7f2531dbd18e1c5f5cff7cbec7ab)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128817
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 6fa2797b73a6..80e22bef5670 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6251,8 +6251,10 @@ void SalInstanceWindow::help()
{
//show help for widget with keyboard focus
vcl::Window* pWidget = ImplGetSVData()->mpWinData->mpFocusWin;
-if (!pWidget || comphelper::LibreOfficeKit::isActive())
+if (!pWidget)
pWidget = m_xWindow;
+if (comphelper::LibreOfficeKit::isActive() &&
m_xWindow->GetFocusedWindow())
+pWidget = m_xWindow->GetFocusedWindow();
OString sHelpId = pWidget->GetHelpId();
while (sHelpId.isEmpty())
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx |
21 ++
writerfilter/qa/cppunittests/dmapper/data/table-negative-vertical-pos.docx
|binary
writerfilter/source/dmapper/PropertyMap.cxx|
11 -
3 files changed, 30 insertions(+), 2 deletions(-)
New commits:
commit ce5f82dbaf1c22f45a08c60eb213bc9bc821c1d1
Author: Miklos Vajna
AuthorDate: Fri Jan 21 10:06:02 2022 +0100
Commit: Michael Stahl
CommitDate: Tue Jan 25 10:13:41 2022 +0100
DOCX import: floating table with negative top margin has to be a fly frame
The bugdoc has a large header, then part of the table goes into the
whitespace of the header by specifying a negative vertical position.
Keep this as a floating table as normal tables can't have negative top
margins.
Change-Id: I95299051f004976778765965971428d9764bef08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128724
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 3eb6d764b3023500f2299d36bf1860bc8e67db9f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128813
Reviewed-by: Michael Stahl
diff --git a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
index 7b552af94bb0..ae32ce1e4dc7 100644
--- a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
@@ -87,6 +88,26 @@ CPPUNIT_TEST_FIXTURE(Test, testFollowPageTopMargin)
// i.e. the top margin on page 2 was too large.
CPPUNIT_ASSERT_EQUAL(static_cast(250), nTopMargin);
}
+
+CPPUNIT_TEST_FIXTURE(Test, testTableNegativeVerticalPos)
+{
+// Given a document with a table which has a negative vertical position
(moves up to overlap
+// with the header):
+OUString aURL
+= m_directories.getURLFromSrc(DATA_DIRECTORY) +
"table-negative-vertical-pos.docx";
+
+// When loading that document:
+getComponent() = loadFromDesktop(aURL);
+
+// Then make sure we don't import that as a plain table, which can't have
a negative top margin:
+uno::Reference
xDrawPageSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference xDrawPage =
xDrawPageSupplier->getDrawPage();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual : 0
+// i.e. this was imported as a plain table, resulting in a 0 top margin (y
pos too large).
+CPPUNIT_ASSERT_EQUAL(static_cast(1), xDrawPage->getCount());
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/writerfilter/qa/cppunittests/dmapper/data/table-negative-vertical-pos.docx
b/writerfilter/qa/cppunittests/dmapper/data/table-negative-vertical-pos.docx
new file mode 100644
index ..2031f4769877
Binary files /dev/null and
b/writerfilter/qa/cppunittests/dmapper/data/table-negative-vertical-pos.docx
differ
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 8634d66e1ae5..58871cc04538 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1146,6 +1146,15 @@ bool SectionPropertyMap::FloatingTableConversion( const
DomainMapper_Impl& rDM_I
if (rDM_Impl.m_bConvertedTable && !rDM_Impl.GetIsLastSectionGroup() &&
rInfo.m_nBreakType == NS_ooxml::LN_Value_ST_SectionMark_nextPage)
return false;
+sal_Int32 nVertOrientPosition =
rInfo.getPropertyValue(u"VertOrientPosition").get();
+sal_Int16 nHoriOrientRelation = rInfo.getPropertyValue(
u"HoriOrientRelation" ).get();
+if (nVertOrientPosition < 0 && nHoriOrientRelation !=
text::RelOrientation::PAGE_FRAME)
+{
+// Negative vertical position: then need a floating table, as normal
tables can't have
+// negative top margins.
+return true;
+}
+
sal_Int32 nPageWidth = GetPageWidth();
sal_Int32 nTextAreaWidth = nPageWidth - GetLeftMargin() - GetRightMargin();
// Count the layout width of the table.
@@ -1161,7 +1170,6 @@ bool SectionPropertyMap::FloatingTableConversion( const
DomainMapper_Impl& rDM_I
if ( rInfo.getPropertyValue( u"RightMargin" ) >>= nRightMargin )
nTableWidth += nRightMargin;
-sal_Int16 nHoriOrientRelation = rInfo.getPropertyValue(
u"HoriOrientRelation" ).get();
sal_Int16 nVertOrientRelation = rInfo.getPropertyValue(
u"VertOrientRelation" ).get();
if ( nHoriOrientRelation == text::RelOrientation::PAGE_FRAME &&
nVertOrientRelation == text::RelOrientation::PAGE_FRAME )
{
@@ -1174,7 +1182,6 @@ bool SectionPropertyMap::FloatingTableConversion( const
DomainMapper_Impl& rDM_I
// The more close we are to the bottom, the more likely the table
will span over to the next page
// So if we're in the bottom l
Re: Making a light 'soft' in a 3D scene
Hi Regina, On 1/24/22 15:51, Regina Henschel wrote: Hi Armin, hi all, a light can be 'harsh' or 'not harsh' (that means 'soft') in an extruded custom shape. This is independent from the material property 'specular'. A 'soft' light is rendered in MS Office, as if the light has a wider emitting area in real world. There are of course possible definitions for that. 'Our' light source is kept pretty simple. We have a point light source with direction, no position (all parallel). I remember that only a fraction of possibilities - the needed ones as so often - were taken into account at that time. I already had to fight to get all those 3D features we have today :-) Sure technically these can be extended. We could add a point/position, so make lighting position-dependent if wanted. Also definitions for a size of a light source are common/possible - that would lead to the light coming not only from one point, but from a sphere surrounding that point. I am not straightforward sure how to do that mathematically, but this just means to dig out the standards & integrate them. AFAIR we tried to keep as close to OpenGL at that time, so the 'old' OpenGL definitions should be most doable/integratable/fitting/implementable (due to that 1st integration of OpenGL 20++ years ago, had to be removed after 1y due to OpenGL not being stable enough on target systems - a problem on SW even with just 1% problems but scales to millions of users...). As so often problem will be more to adapt the model data, processing, file formats, UI, etc..., then the visualization I guess. The 3D fallback SW renderer can/should be easily extended if you know what you do, it is modular. Also always a good point is to keep an eye on compatibility to standards, if we want to impl system-dependent 3D renderers, too. One Q stays open, though: AFAIR those defs will/may also influence shadow which in case of soft light with non-hard boundaries will have to soften/fade, too. That would be expensive since shadow of 3D is not part of 3D scene, but generated 2D geometry that then would have to be faded -> pixel operations & in theory full back/forth transform 2D/3D to do that mathematically correctly. Also shadow on other 3D objects would be more difficult/expensive if we would once need that (not yet needed). Does our competitor do that...? HTH for the moment, ALG The UI of our 3D-Scenes does not have something in this kind. Is there in the internal handling of 3D-Scenes something, that can easily be extended to produce such light effect? Currently I experiment with using additional lights in the 3D-scene that is used to render an extruded custom shape. But that emulates the effect not really good and means a large effort. Kind regards, Regina -- -- ALG (PGP: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2)
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/unx
vcl/unx/gtk3/gtkinst.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 9d39aba021434fbb07f7e362ecaab1c75d2ff5fc Author: Caolán McNamara AuthorDate: Mon Jan 24 13:18:56 2022 + Commit: Michael Stahl CommitDate: Tue Jan 25 10:11:12 2022 +0100 gtk3: "expand" icon in reference windows goes missing on entering shrunk mode Change-Id: Ie303f82d1cc0de10ebd14248a3a16be344f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128814 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 8db5257711c5..515eabb1fe73 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -6958,6 +6958,9 @@ public: gtk_container_set_border_width(GTK_CONTAINER(m_pDialog), 0); if (GtkWidget* pActionArea = gtk_dialog_get_action_area(GTK_DIALOG(m_pDialog))) gtk_widget_hide(pActionArea); +gtk_widget_show_all(pRefEdit); +if (pRefBtn) +gtk_widget_show_all(pRefBtn); #else if (GtkWidget* pActionArea = gtk_dialog_get_header_bar(GTK_DIALOG(m_pDialog))) gtk_widget_hide(pActionArea);
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 4723360671758c3ac9e646382751d01b630a95d0
Author: Caolán McNamara
AuthorDate: Mon Jan 24 20:09:49 2022 +
Commit: Michael Stahl
CommitDate: Tue Jan 25 10:10:21 2022 +0100
tdf#146971 changing a11y desc to replace %PRODUCTNAME has perf issues
so leave it alone, and do the conversion just for the originally
report situation as a safely backportable change with a follow up
to not allow us to get into this situation in the first place
Change-Id: I4f95f85791d0f937e53d7541804870b2cbf62b44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128820
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f5f1498443dc..8db5257711c5 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21926,7 +21926,15 @@ namespace {
const char* pDesc = pAtkObject ?
atk_object_get_description(pAtkObject) : nullptr;
if (pDesc && pDesc[0])
{
-gtk_tooltip_set_text(tooltip, pDesc);
+if (ResHookProc pStringReplace =
Translate::GetReadStringHook())
+{
+// tdf#142704 %PRODUCTNAME shown in extended tips
+OUString aDesc(pDesc, strlen(pDesc),
RTL_TEXTENCODING_UTF8);
+aDesc = (*pStringReplace)(aDesc);
+gtk_tooltip_set_text(tooltip, OUStringToOString(aDesc,
RTL_TEXTENCODING_UTF8).getStr());
+}
+else
+gtk_tooltip_set_text(tooltip, pDesc);
return true;
}
#endif
@@ -22484,18 +22492,6 @@ private:
aTooltip = (*m_pStringReplace)(aTooltip);
gtk_widget_set_tooltip_text(pWidget,
OUStringToOString(aTooltip, RTL_TEXTENCODING_UTF8).getStr());
}
-
-#if !GTK_CHECK_VERSION(4, 0, 0)
-// tdf#142704 %PRODUCTNAME shown in extended tips
-AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget);
-const char* pDesc = pAtkObject ?
atk_object_get_description(pAtkObject) : nullptr;
-if (pDesc && pDesc[0])
-{
-OUString aDesc(pDesc, strlen(pDesc), RTL_TEXTENCODING_UTF8);
-aDesc = (*m_pStringReplace)(aDesc);
-atk_object_set_description(pAtkObject,
OUStringToOString(aDesc, RTL_TEXTENCODING_UTF8).getStr());
-}
-#endif
}
// expand placeholder and collect potentially missing mnemonics
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/basedlgs.hxx |2 +-
sfx2/source/dialog/basedlgs.cxx |7 +++
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 9446b3ccd1240dbd44cbe1f1ccdfca04b61c85af
Author: Caolán McNamara
AuthorDate: Mon Jan 24 15:46:50 2022 +0200
Commit: Caolán McNamara
CommitDate: Tue Jan 25 10:04:38 2022 +0100
tdf#146571 Ignore focus changes after closing Manage changes dialog
Change-Id: Ib588310410a265acdd129a8e51adf56bb5973bd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128869
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index e7cf250d1159..2adc649a8ec8 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -47,7 +47,7 @@ public:
// when the dialog has an associated SfxChildWin, typically for Modeless
interaction
virtual void ChildWinDispose() {} // called from the associated
SfxChildWin dtor
-virtual void Close() {} // called by the SfxChildWin when the dialog is
closed
+virtual void Close(); // called by the SfxChildWin when the dialog is
closed
virtual void EndDialog(int nResponse); // called by the SfxChildWin to
close the dialog
};
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 7319b9981419..2fefb02ff125 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -197,6 +197,7 @@ void SfxModelessDialogController::Close()
m_pBindings->GetDispatcher_Impl()->ExecuteList(
m_xImpl->pMgr->GetType(),
SfxCallMode::RECORD|SfxCallMode::SYNCHRON, { &aValue } );
+SfxDialogController::Close();
}
SfxDialogController::SfxDialogController(weld::Widget* pParent, const
OUString& rUIFile,
@@ -210,6 +211,12 @@ SfxDialogController::SfxDialogController(weld::Widget*
pParent, const OUString&
m_xDialog->connect_container_focus_changed(LINK(this, SfxDialogController,
FocusChangeHdl));
}
+void SfxDialogController::Close()
+{
+// tdf3146571 ignore focus changes after we've closed
+m_xDialog->connect_container_focus_changed(Link());
+}
+
IMPL_STATIC_LINK_NOARG(SfxDialogController, InstallLOKNotifierHdl, void*,
vcl::ILibreOfficeKitNotifier*)
{
return SfxViewShell::Current();
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter2.cxx | 47 +++
sw/source/uibase/dochdl/swdtflvr.cxx | 17
2 files changed, 64 insertions(+)
New commits:
commit 5a1c19624eda0c8b847af0dcee70b82502578ceb
Author: László Németh
AuthorDate: Fri Jan 21 11:13:27 2022 +0100
Commit: László Németh
CommitDate: Tue Jan 25 09:51:11 2022 +0100
tdf#146965 sw track changes: fix tracked table row moving
During track changes, drag & drop or Cut & Paste
a table row resulted a nested table in the first cell of
the newly inserted empty table row instead of moving
the original table row.
Test: select a table row by clicking on their left border,
and drag & drop or Cut & Paste it in a different
table row.
Note: This fixes crashing at Redo of tracked table row
insertion, too.
Regression from commit dbc82c02eb24ec1c97c6ee32069771d8deb394f9
"tdf#143358 sw: track insertion of empty table rows".
Change-Id: I9a31cae2c0e6e5e05450336a1e5b8d792035df35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128726
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 3463f850d3dd..157891b1b363 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -5063,6 +5063,53 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testTdf145089_RedlineTableRowInsertionDOCX
assertXPath(pXmlDoc, "//page[1]//body/tab/row", 1);
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testPasteTrackedTableRow)
+{
+// load a 1-row table
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf118311.fodt");
+
+// turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On |
RedlineFlags::ShowDelete
+ |
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+ pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// check table count
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+
+// check table row count
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+
+// copy table row and paste it by Paste Special->Rows Above
+dispatchCommand(mxComponent, ".uno:SelectTable", {});
+dispatchCommand(mxComponent, ".uno:Copy", {});
+dispatchCommand(mxComponent, ".uno:Escape", {});
+dispatchCommand(mxComponent, ".uno:PasteRowsBefore", {});
+
+// 2-row table
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+
+// This was 2 (inserted as a nested table in the first cell of the new row)
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+
+// Is it a tracked row insertion? Its rejection results the original 1-row
table
+dispatchCommand(mxComponent, ".uno:RejectAllTrackedChanges", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTable->getRows()->getCount());
+
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf145091)
{
// load a deleted table, reject them, and delete only its text and export
to DOCX
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index c70bd679c658..c3047586acd7 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -109,6 +109,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1591,6 +1592,12 @@ bool SwTransferable::Paste(SwWrtShell& rSh,
TransferableDataHelper& rData, RndSt
IDocumentMarkAccess::MarkType::UNO_BOOKMARK );
// add a new empty row/column before the actual table row/column
and go there
+// (without setting the rows to tracked table row insertion here,
do that at the end
+// to avoid layout problems and unnecessary insertion of dummy
characters for empty rows)
+RedlineFlags eOld =
rSh.GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags();
+if ( eOld & RedlineFlags::On )
+rSh.GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags(
eOld | RedlineFlags::Ignore );
+
const sal_uInt16 nDispatchSlot = bRowMode
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin4.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit cd7abd3e2c6bb28ecfeb1acef675280cfe438e3e
Author: Dennis Francis
AuthorDate: Wed Nov 10 18:53:14 2021 +0530
Commit: Dennis Francis
CommitDate: Tue Jan 25 09:37:06 2022 +0100
lokCalcRTL: h-flip the "combined" tile
This h-flip is needed because the tile containing cell A1 will have the
coordinates (0, 0). Further aim is to have document coordinates for all
tile messages and tile invalidation messages. The LOK client should be
able to map the document coordinates to the correct view coordinates.
In the lok client we also need to h-flip the "regular" tiles at the tile
position.
Change-Id: Iaf89afeb89f916cb490800ee5d34c4780125f3a0
(cherry picked from commit b3ca461871a92d8d2bd1d4ee713046ee74abbcf0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128890
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index f92b92096766..8c9e4e01507c 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1566,6 +1566,13 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
if (ScDrawView* pDrawView = mrViewData.GetScDrawView())
pDrawView->resetGridOffsetsForAllSdrPageViews();
}
+
+if (bLayoutRTL)
+{
+Bitmap aCellBMP = rDevice.GetBitmap(Point(0, 0), Size(nOutputWidth,
nOutputHeight));
+aCellBMP.Mirror(BmpMirrorFlags::Horizontal);
+rDevice.DrawBitmap(Point(0, 0), Size(nOutputWidth, nOutputHeight),
aCellBMP);
+}
}
void ScGridWindow::LogicInvalidate(const tools::Rectangle* pRectangle)
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 97cf76e9197a244a7d12f1f0a52074ccf36685e2
Author: Caolán McNamara
AuthorDate: Mon Jan 24 20:09:49 2022 +
Commit: Caolán McNamara
CommitDate: Tue Jan 25 09:32:20 2022 +0100
tdf#146971 changing a11y desc to replace %PRODUCTNAME has perf issues
so leave it alone, and do the conversion just for the originally
report situation as a safely backportable change with a follow up
to not allow us to get into this situation in the first place
Change-Id: I4f95f85791d0f937e53d7541804870b2cbf62b44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128886
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 718342710d62..b3c4c0d2352d 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22042,7 +22042,15 @@ namespace {
const char* pDesc = pAtkObject ?
atk_object_get_description(pAtkObject) : nullptr;
if (pDesc && pDesc[0])
{
-gtk_tooltip_set_text(tooltip, pDesc);
+if (ResHookProc pStringReplace =
Translate::GetReadStringHook())
+{
+// tdf#142704 %PRODUCTNAME shown in extended tips
+OUString aDesc(pDesc, strlen(pDesc),
RTL_TEXTENCODING_UTF8);
+aDesc = (*pStringReplace)(aDesc);
+gtk_tooltip_set_text(tooltip, OUStringToOString(aDesc,
RTL_TEXTENCODING_UTF8).getStr());
+}
+else
+gtk_tooltip_set_text(tooltip, pDesc);
return true;
}
#endif
@@ -22605,18 +22613,6 @@ private:
aTooltip = (*m_pStringReplace)(aTooltip);
gtk_widget_set_tooltip_text(pWidget,
OUStringToOString(aTooltip, RTL_TEXTENCODING_UTF8).getStr());
}
-
-#if !GTK_CHECK_VERSION(4, 0, 0)
-// tdf#142704 %PRODUCTNAME shown in extended tips
-AtkObject* pAtkObject = gtk_widget_get_accessible(pWidget);
-const char* pDesc = pAtkObject ?
atk_object_get_description(pAtkObject) : nullptr;
-if (pDesc && pDesc[0])
-{
-OUString aDesc(pDesc, strlen(pDesc), RTL_TEXTENCODING_UTF8);
-aDesc = (*m_pStringReplace)(aDesc);
-atk_object_set_description(pAtkObject,
OUStringToOString(aDesc, RTL_TEXTENCODING_UTF8).getStr());
-}
-#endif
}
// expand placeholder and collect potentially missing mnemonics
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - filter/qa filter/source
filter/qa/unit/data/attributeRedefinedTest.odp |binary
filter/qa/unit/svg.cxx | 42 +
filter/source/svg/svgwriter.cxx| 14 +++-
3 files changed, 55 insertions(+), 1 deletion(-)
New commits:
commit e3a0ef15eb7abccff6b55940dbd9b3278004388a
Author: Rash419
AuthorDate: Mon Jan 24 15:56:15 2022 +0530
Commit: Andras Timar
CommitDate: Tue Jan 25 09:24:33 2022 +0100
svgexport: fix: attribute id redefined
If there is a id for empty paragraph exist we need to create a empty
text paragraph to accomodate the id if we don't do that then we
get multiple id attribute on same element for example:
Change-Id: I41c21dc94deef93e423aaff2248f6931fa6ca8de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128884
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/filter/qa/unit/data/attributeRedefinedTest.odp
b/filter/qa/unit/data/attributeRedefinedTest.odp
new file mode 100644
index ..dfb814bfb9ec
Binary files /dev/null and b/filter/qa/unit/data/attributeRedefinedTest.odp
differ
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index c59d3cf63dca..95f894ed42cd 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -138,6 +138,48 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testShapeNographic)
xStorable->storeToURL("private:stream",
aMediaDescriptor.getAsConstPropertyValueList());
}
+CPPUNIT_TEST_FIXTURE(SvgFilterTest, attributeRedefinedTest)
+{
+// Load document containing empty paragraphs with ids.
+load("attributeRedefinedTest.odp");
+
+// Export to SVG.
+uno::Reference xStorable(getComponent(),
uno::UNO_QUERY_THROW);
+SvMemoryStream aStream;
+uno::Reference xOut = new
utl::OOutputStreamWrapper(aStream);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("impress_svg_Export");
+aMediaDescriptor["OutputStream"] <<= xOut;
+xStorable->storeToURL("private:stream",
aMediaDescriptor.getAsConstPropertyValueList());
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+xmlDocPtr pXmlDoc = parseXmlStream(&aStream);
+
+// We expect four paragraph
+// 2 empty paragraphs with ids
+// 2 paragraphs with text
+// Without the accompanying fix the test would have failed with
+// Expected : 4
+// Actual : 2
+// i.e. 2 of the empty paragraph do not get generated even if there
+// is id imported for the paragraphs
+// If we don't create the empty paragraphs the id attribute attribute gets
redefined like this:
+//
+
+OString xPath =
"//svg:g[@class='TextShape']//svg:text[@class='SVGTextShape']//"
+"svg:tspan[@class='TextParagraph']";
+assertXPath(pXmlDoc, xPath, 4);
+
+//assert that each tspan element with TextParagraph class has id and the
tspan element of
+//each empty paragraph doesnot contain tspan element with class
TextPosition
+assertXPath(pXmlDoc, xPath + "[1]", "id", "id4");
+assertXPath(pXmlDoc, xPath + "[2]", "id", "id5");
+assertXPath(pXmlDoc, xPath + "[2]//svg:tspan[@class='TextPosition']", 0);
+assertXPath(pXmlDoc, xPath + "[3]", "id", "id6");
+assertXPath(pXmlDoc, xPath + "[3]//svg:tspan[@class='TextPosition']", 0);
+assertXPath(pXmlDoc, xPath + "[4]", "id", "id7");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 95980ce9b932..694cc073a81c 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1077,7 +1077,19 @@ bool SVGTextWriter::nextParagraph()
const OUString& rParagraphId = implGetValidIDFromInterface(
Reference(xTextContent, UNO_QUERY) );
if( !rParagraphId.isEmpty() )
{
-mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId );
+// if there is id for empty paragraph we need to create a empty
text paragraph
+Reference < XTextRange > xRange( xTextContent, UNO_QUERY_THROW );
+if ( xRange.is() && xRange->getString().isEmpty() )
+{
+endTextParagraph();
+mrExport.AddAttribute( XML_NAMESPACE_NONE, "class",
"TextParagraph" );
+mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId
);
+mpTextParagraphElem.reset(new SvXMLElementExport( mrExport,
XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ));
+}
+else
+{
+mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rParagraphId
);
+}
}
return true;
}
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
writerfilter/source/dmapper/GraphicImport.cxx |5 +
writerfilter/source/dmapper/GraphicImport.hxx |2 ++
3 files changed, 8 insertions(+)
New commits:
commit 9aa90da7e03b4b0806b27451665b7c41b8836bc0
Author: Tor Lillqvist
AuthorDate: Mon Jan 24 16:48:04 2022 +0200
Commit: Tor Lillqvist
CommitDate: Tue Jan 25 09:22:18 2022 +0100
Take layoutInCell into consideration when placing graphic in table
Set our IsFollowingTextFlow property accordingly.
Thanks to Miklos for doing most of the work.
Change-Id: I67d214d6ed41c19dcb2f3ad2db9be94ca77c5842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128880
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 57ffccbac8f6..f0902918e0ff 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -7457,6 +7457,7 @@ void DomainMapper_Impl::ImportGraphic(const
writerfilter::Reference< Properties
{
uno::Reference xEmbeddedProps(m_xEmbedded,
uno::UNO_QUERY);
xEmbeddedProps->setPropertyValue("AnchorType",
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xEmbeddedProps->setPropertyValue("IsFollowingTextFlow",
uno::makeAny(m_pGraphicImport->GetLayoutInCell()));
uno::Reference xShapeProps(xShape,
uno::UNO_QUERY);
xEmbeddedProps->setPropertyValue("HoriOrient",
xShapeProps->getPropertyValue("HoriOrient"));
xEmbeddedProps->setPropertyValue("HoriOrientPosition",
xShapeProps->getPropertyValue("HoriOrientPosition"));
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index bb3b2077e4aa..4fe5712b591f 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -474,6 +474,11 @@ com::sun::star::awt::Point
GraphicImport::GetGraphicObjectPosition() const
return (com::sun::star::awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
}
+bool GraphicImport::GetLayoutInCell() const
+{
+return m_pImpl->bLayoutInCell;
+}
+
void GraphicImport::handleWrapTextValue(sal_uInt32 nVal)
{
switch (nVal)
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx
b/writerfilter/source/dmapper/GraphicImport.hxx
index 57c3dbef906a..93be2df3f601 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -100,6 +100,8 @@ public:
com::sun::star::awt::Point GetGraphicObjectPosition() const;
+bool GetLayoutInCell() const;
+
private:
// Properties
virtual void lcl_attribute(Id Name, Value & val) override;
