[Libreoffice-commits] core.git: helpcontent2

[Roman Kuznetsov (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit edb953cfb77c7ad6578a191b48c47c25d8d59d11
Author: Roman Kuznetsov 
AuthorDate: Mon Jan 18 08:34:19 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Jan 18 08:34:19 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 85aba709f71b6d1443db98fbacb22d9b47a71123
  - tdf#139616 Updating a conditional formatting help page

Change-Id: Id34c8e5e003802635e30a7e038d9f413625f1306
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109404
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index c5ca7b12b4d5..85aba709f71b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c5ca7b12b4d593f22db0d450a46335879b5ff2e2
+Subproject commit 85aba709f71b6d1443db98fbacb22d9b47a71123
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Roman Kuznetsov (via logerrit)]

 source/text/scalc/guide/cellstyle_conditional.xhp |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 85aba709f71b6d1443db98fbacb22d9b47a71123
Author: Roman Kuznetsov 
AuthorDate: Sat Jan 16 20:46:59 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 18 08:34:19 2021 +0100

tdf#139616 Updating a conditional formatting help page

Change-Id: Id34c8e5e003802635e30a7e038d9f413625f1306
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109404
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/guide/cellstyle_conditional.xhp 
b/source/text/scalc/guide/cellstyle_conditional.xhp
index 0b7b0de31..c52d748d7 100644
--- a/source/text/scalc/guide/cellstyle_conditional.xhp
+++ b/source/text/scalc/guide/cellstyle_conditional.xhp
@@ -39,7 +39,7 @@
 mw deleted "formats;"
 Applying Conditional Formatting
 
-  Using 
the menu command Format - Conditional formatting, the dialog 
allows you to define conditions per cell, which must be met in order for the 
selected cells to have a particular format.
+  Using 
the menu command Format - Conditional - Condition, the dialog 
allows you to define conditions per cell, which must be met in order for the 
selected cells to have a particular format.
   To apply 
conditional formatting, AutoCalculate must be enabled. Choose Data - 
Calculate - AutoCalculate (you see a check mark next to the command when 
AutoCalculate is enabled).
   With 
conditional formatting, you can, for example, highlight the totals that exceed 
the average value of all totals. If the totals change, the formatting changes 
correspondingly, without having to apply other styles manually.
   To Define the Conditions
@@ -48,7 +48,7 @@
 Select the cells to which you want to apply a conditional 
style.
  
  
-Choose Format - Conditional Formatting.
+Choose Format - Conditional - 
Condition.
  
  
 Enter the condition(s) into the dialog box. The dialog is 
described in detail in $[officename] Help, and an example is provided 
below:
@@ -59,7 +59,7 @@
   You want 
to give certain values in your tables particular emphasis. For example, in a 
table of turnovers, you can show all the values above the average in green and 
all those below the average in red. This is possible with conditional 
formatting.
   
  
-First of all, write a table in which a few different values 
occur. For your test you can create tables with any random numbers:
+First of all, create a table in which a few different values 
occur. For your test you can create tables with any random numbers:
 In 
one of the cells enter the formula =RAND(), and you will obtain a random number 
between 0 and 1. If you want integers of between 0 and 50, enter the formula 
=INT(RAND()*50).
  
  
@@ -76,10 +76,10 @@
 Click in a blank cell and select the command Format 
Cells in the context menu.
  
  
-In 
the Format Cells dialog on the Background tab, select 
a background color. Click OK.
+In 
the Format Cells dialog on the Background tab, click 
the Color button and then select a background color. Click 
OK.
  
  
-In 
the Styles window, click the New Style from Selection icon. Enter 
the name of the new style. For this example, name the style "Above".
+In 
the Styles deck of the Sidebar, click the New Style from Selection 
icon. Enter the name of the new style. For this example, name the style 
"Above".
  
  
 To 
define a second style, click again in a blank cell and proceed as described 
above. Assign a different background color for the cell and assign a name (for 
this example, "Below").
@@ -92,7 +92,7 @@
 Set 
the cursor in a blank cell, for example, J14, and choose Insert - 
Function.
  
  
-Select the AVERAGE function. Use the mouse to select all your 
random numbers. If you cannot see the entire range, because the Function Wizard 
is obscuring it, you can temporarily shrink the dialog using the Shrink / Maximize 
icon.
+Select the AVERAGE function. Use the mouse to select all your 
random numbers. If you cannot see the entire range, because the Function Wizard 
is obscuring it, you can temporarily shrink the dialog using the Shrink icon.
  
  
 Close the Function Wizard with OK.
@@ -105,7 +105,7 @@
 Select all cells with the random numbers.
  
  
-Choose the Format - Conditional Formatting command 
to open the corresponding dialog.
+Choose the Format - Conditional - Condition 
command to open the corresponding dialog.
  
  
 Define the condition as follows: If cell value is less than 
J14, 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - solenv/clang-format vcl/inc vcl/ios vcl/Library_vcl.mk vcl/Library_vclplug_osx.mk vcl/osx vcl/quartz

[Tor Lillqvist (via logerrit)]

 solenv/clang-format/excludelist |4 
 vcl/Library_vcl.mk  |1 
 vcl/Library_vclplug_osx.mk  |3 
 vcl/inc/quartz/salgdi.h |   14 -
 vcl/ios/salios.cxx  |  441 
 vcl/osx/salmacos.cxx|  385 ++
 vcl/quartz/salbmp.cxx   |   58 -
 vcl/quartz/salgdicommon.cxx |  181 
 vcl/quartz/salvd.cxx|  104 -
 9 files changed, 839 insertions(+), 352 deletions(-)

New commits:
commit 2fc4d9acb2e04a2cb868a82a394bf23239487511
Author: Tor Lillqvist 
AuthorDate: Sun Jan 17 21:29:10 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 18 08:30:44 2021 +0100

tdf#138122: Fix vcl for iOS after 1a167625314bf36b735176ed488e6ba9b5e9b675

Make vcl compile again for iOS and make the Collabora Office iOS app
work again when built against a master build of core.

For now, keep the old versions of the functions touched by
1a167625314bf36b735176ed488e6ba9b5e9b675 in vcl/ios/salios.cxx, and
move the modified versions to the new file vcl/osx/salmacos.cxx.

Keep the functions as they were except that ifdefs for MACOSX or IOS
are expanded. Keep the formatting as it was to make comparisons
easier. Thus add the new files to the clang-format exclusion list.

While at it, also move vcl/quartz/salgdiutils.cxx to vcl/osx as it is
compiled only for macOS anyway.

Change-Id: I990ef678f2263031d4a5af8cc547fffe185d17c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109480
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109501
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 7c4d0e000706..0ce9080c8b49 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14882,6 +14882,7 @@ vcl/inc/window.h
 vcl/inc/wizdlg.hxx
 vcl/ios/dummies.cxx
 vcl/ios/iosinst.cxx
+vcl/ios/salios.cxx
 vcl/null/printerinfomanager.cxx
 vcl/opengl/FixedTextureAtlas.cxx
 vcl/opengl/LineRenderUtils.cxx
@@ -14923,7 +14924,9 @@ vcl/osx/documentfocuslistener.cxx
 vcl/osx/documentfocuslistener.hxx
 vcl/osx/saldata.cxx
 vcl/osx/salframe.cxx
+vcl/osx/salgdiutils.cxx
 vcl/osx/salinst.cxx
+vcl/osx/salmacos.cxx
 vcl/osx/salmenu.cxx
 vcl/osx/salnativewidgets.cxx
 vcl/osx/salobj.cxx
@@ -14949,7 +14952,6 @@ vcl/quartz/ctfonts.cxx
 vcl/quartz/salbmp.cxx
 vcl/quartz/salgdi.cxx
 vcl/quartz/salgdicommon.cxx
-vcl/quartz/salgdiutils.cxx
 vcl/quartz/salvd.cxx
 vcl/quartz/utils.cxx
 vcl/source/app/IconThemeInfo.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index bc6b8f8f9af7..c661063e9641 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -687,6 +687,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/ios/iosinst \
 vcl/ios/dummies \
 vcl/ios/clipboard \
+vcl/ios/salios \
 vcl/ios/iOSTransferable \
 vcl/ios/DataFlavorMapping \
 vcl/ios/HtmlFmtFlt \
diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk
index f0d22298a0c8..9b82bd44c2a6 100644
--- a/vcl/Library_vclplug_osx.mk
+++ b/vcl/Library_vclplug_osx.mk
@@ -120,7 +120,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_osx,\
 vcl/osx/documentfocuslistener \
 vcl/osx/saldata \
 vcl/osx/salframe \
+vcl/osx/salgdiutils \
 vcl/osx/salinst \
+vcl/osx/salmacos \
 vcl/osx/salmenu \
 vcl/osx/salnativewidgets \
 vcl/osx/salobj \
@@ -132,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_osx,\
 vcl/quartz/salbmp \
 vcl/quartz/salgdi \
 vcl/quartz/salgdicommon \
-vcl/quartz/salgdiutils \
 vcl/quartz/salvd \
 vcl/quartz/utils \
 ))
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 64eb003e16cd..f5ff134259a6 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -191,16 +191,16 @@ public:
 boolIsPenVisible() const{ return 
maLineColor.IsVisible(); }
 boolIsBrushVisible() const  { return 
maFillColor.IsVisible(); }
 
-float   GetWindowScaling();
-voidSetWindowGraphics( AquaSalFrame* pFrame );
-voidSetPrinterGraphics(CGContextRef, sal_Int32 
nRealDPIX, sal_Int32 nRealDPIY);
 voidSetVirDevGraphics(CGLayerHolder const &rLayer, 
CGContextRef, int nBitDepth = 0);
 #ifdef MACOSX
 voidinitResolution( NSWindow* );
 voidcopyResolution( AquaSalGraphics& );
 voidupdateResolution();
 
+float   GetWindowScaling();
+voidSetWindowGraphics( AquaSalFrame* pFrame );
 boolIsWindowGraphics()  const   { return mbWindow; 
}
+voidSetPrinterGraphics(CGCont

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/inc

[Tor Lillqvist (via logerrit)]

 vcl/inc/quartz/CGHelpers.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b5c42230f48f75d6e4187b1db15b249893ed46b
Author: Tor Lillqvist 
AuthorDate: Mon Jan 4 13:12:11 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 18 08:30:18 2021 +0100

CGLayerHolder::getScale() can be const

(Will be required by upcoming bugfix.)

Change-Id: I727b2b5f1035ae70d62d3c5339a814161e3ec92a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108663
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109494
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/inc/quartz/CGHelpers.hxx b/vcl/inc/quartz/CGHelpers.hxx
index cbd9a5e785f4..c83477ead4fe 100644
--- a/vcl/inc/quartz/CGHelpers.hxx
+++ b/vcl/inc/quartz/CGHelpers.hxx
@@ -68,7 +68,7 @@ public:
 
 void set(CGLayerRef const& pLayer) { mpLayer = pLayer; }
 
-float getScale() { return mfScale; }
+float getScale() const { return mfScale; }
 
 void setScale(float fScale) { mfScale = fScale; }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - desktop/Executable_soffice_bin.mk vcl/inc vcl/osx vcl/quartz

[Thorsten Wagner (via logerrit)]

 desktop/Executable_soffice_bin.mk |   12 -
 vcl/inc/quartz/salgdi.h   |   16 +
 vcl/osx/salinst.cxx   |   15 +
 vcl/quartz/salbmp.cxx |   22 +-
 vcl/quartz/salgdi.cxx |8 
 vcl/quartz/salgdicommon.cxx   |  315 +++---
 vcl/quartz/salgdiutils.cxx|   41 
 vcl/quartz/salvd.cxx  |  119 +-
 8 files changed, 260 insertions(+), 288 deletions(-)

New commits:
commit 44dfa5ef2ffac1740ba270978de3e1b12484b5e8
Author: Thorsten Wagner 
AuthorDate: Sun Jan 10 23:49:25 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 18 08:28:24 2021 +0100

tdf#138122 Add window scaling for retina displays on macOS

(1) Remove hack to make application look as if being linked against SDK 
10.13

(2) Use quad storage size on virtual devices for displaying on retina 
displays thereafter

(3) Apply workaround to downsample bitmaps from scaled layers (to be 
implemented)

(4) Disable dark mode (to be implemented)

(5) Provide new environment variables:

VCL_MACOS_FORCE_WINDOW_SCALING:
window scaling on non retina displays

VCL_MACOS_FORCE_DARK_MODE:
enable dark mode (macOS 10.14, iOS 13 and newer)

VCL_MACOS_USE_SYSTEM_APPEARANCE:
use light mode or dark mode (macOS 10.14, iOS 13 and newer) as configured 
by system preferences

Change-Id: I99877cd62a98cb91bcbf27af62b043c31c5f5fc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109072
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109495
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/desktop/Executable_soffice_bin.mk 
b/desktop/Executable_soffice_bin.mk
index 5c895ed0e7cb..9c08a28361df 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -23,18 +23,6 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
 desktop/source/app/main \
 ))
 
-ifeq ($(OS),MACOSX)
-# At least when building against SDK 10.15, changing the LC_VERSION_MIN_MACOSX 
load command's sdk
-# value from 10.15 to "n/a" (i.e., 0.0.0) is necessary to avoid blurry text in 
the LO UI (see
-# 

-# "[driver][darwin] Pass -platform_version flag to the linker instead of the
-# -_version_min flag", 
clang/test/Driver/darwin-ld-platform-version-macos.c in particular,
-# for the -platform_version that Clang passes by default to new-enough ld):
-$(eval $(call gb_Executable_add_ldflags,soffice_bin, \
--Xlinker -platform_version -Xlinker macos -Xlinker 
$(MACOSX_DEPLOYMENT_TARGET) -Xlinker 0.0.0 \
-))
-endif
-
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Executable_set_targettype_gui,soffice_bin,NO))
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index d718cf788dcc..64eb003e16cd 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -175,6 +175,7 @@ class AquaSalGraphics : public SalGraphics
 #ifdef MACOSX
 /// is this a window graphics
 boolmbWindow;
+boolmbWindowScaling;
 
 #else // IOS
 
@@ -190,10 +191,10 @@ public:
 boolIsPenVisible() const{ return 
maLineColor.IsVisible(); }
 boolIsBrushVisible() const  { return 
maFillColor.IsVisible(); }
 
+float   GetWindowScaling();
 voidSetWindowGraphics( AquaSalFrame* pFrame );
-voidSetPrinterGraphics(
-CGContextRef, sal_Int32 nRealDPIX, sal_Int32 nRealDPIY );
-voidSetVirDevGraphics(CGLayerHolder const & rLayer, 
CGContextRef, int nBitDepth = 0);
+voidSetPrinterGraphics(CGContextRef, sal_Int32 
nRealDPIX, sal_Int32 nRealDPIY);
+voidSetVirDevGraphics(CGLayerHolder const &rLayer, 
CGContextRef, int nBitDepth = 0);
 #ifdef MACOSX
 voidinitResolution( NSWindow* );
 voidcopyResolution( AquaSalGraphics& );
@@ -300,9 +301,14 @@ public:
 virtual booldrawAlphaRect( tools::Long nX, tools::Long nY, 
tools::Long nWidth,
tools::Long nHeight, sal_uInt8 
nTransparency ) override;
 
+protected:
+virtual voidcopyScaledArea( tools::Long nDestX, tools::Long 
nDestY, tools::Long nSrcX, tools::Long nSrcY,
+tools::Long nSrcWidth, 
tools::Long nSrcHeight, SalGraphics* pSrcGraphics );
+
 // native widget rendering methods that require mirroring
+
 #ifdef MACOSX
-protected:
+
 virtual boolisNativeControlSupported( ControlType nType, 
ControlPart nPart ) override;
 
 virtual boolhitTestNativeControl( ControlType nType, 
ControlPart nPart, const tools::Rectangle& rControlRegion,
@

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

[Kiyotaka Nishibori (via logerrit)]

 cui/uiconfig/ui/areatabpage.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d710b7c8432d868f7c3f0bad30f2f13d4d504ec5
Author: Kiyotaka Nishibori 
AuthorDate: Sun Jan 17 10:58:27 2021 +0900
Commit: Heiko Tietze 
CommitDate: Mon Jan 18 08:23:16 2021 +0100

tdf#139691: fixed wrong extend-tips in areatabpage.ui.

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

diff --git a/cui/uiconfig/ui/areatabpage.ui b/cui/uiconfig/ui/areatabpage.ui
index 04e8243d6df5..9296a5b6cf6f 100644
--- a/cui/uiconfig/ui/areatabpage.ui
+++ b/cui/uiconfig/ui/areatabpage.ui
@@ -72,7 +72,7 @@
 True
 
   
-Fills the object 
with a gradient selected on this page.
+Fills the object 
with a color selected on this page.
   
 
   
@@ -108,7 +108,7 @@
 True
 
   
-Fills the 
object with a hatching pattern selected on this page.
+Fills the 
object with a bitmap image selected on this page.
   
 
   
@@ -126,7 +126,7 @@
 True
 
   
-Fills the 
object with a hatching pattern selected on this page.
+Fills the 
object with a dot pattern selected on this page.
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/osx

[Thorsten Wagner (via logerrit)]

 vcl/osx/salframe.cxx |   32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

New commits:
commit 1cf7ce5a57e50a734258b83a3919a59aa535241f
Author: Thorsten Wagner 
AuthorDate: Sun Jan 17 20:24:26 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 18 08:06:03 2021 +0100

tdf#138314 Change selected tab text color on macOS Big Sur

Starting with macOS Big Sur, coloring has changed. Currently there is
no documentation which system color should be used for selected tab
text. As a workaround text color is changed for macOS Big Sur and
newer only.

Change-Id: I2e8c83527775c17f95e5e4afe70577442e14715e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109479
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109502
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index b4168a2142e7..9d4f68827a06 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1302,27 +1302,37 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 // black otherwise
 
 Color aControlTextColor(getColor([NSColor controlTextColor], COL_BLACK, 
mpNSWindow));
-Color aSelectedControlTextColor(getColor([NSColor 
alternateSelectedControlTextColor], COL_WHITE, mpNSWindow));
-aStyleSettings.SetDefaultButtonTextColor(aSelectedControlTextColor);
+Color aSelectedControlTextColor(getColor([NSColor 
selectedControlTextColor], COL_BLACK, mpNSWindow));
+Color aAlternateSelectedControlTextColor(getColor([NSColor 
alternateSelectedControlTextColor], COL_WHITE, mpNSWindow));
+
aStyleSettings.SetDefaultButtonTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetButtonTextColor(aControlTextColor);
-aStyleSettings.SetDefaultActionButtonTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetDefaultActionButtonTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetActionButtonTextColor(aControlTextColor);
 aStyleSettings.SetFlatButtonTextColor(aControlTextColor);
-
aStyleSettings.SetDefaultButtonRolloverTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetDefaultButtonRolloverTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetButtonRolloverTextColor(aControlTextColor);
-
aStyleSettings.SetDefaultActionButtonRolloverTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetDefaultActionButtonRolloverTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetActionButtonRolloverTextColor(aControlTextColor);
 aStyleSettings.SetFlatButtonRolloverTextColor(aControlTextColor);
-
aStyleSettings.SetDefaultButtonPressedRolloverTextColor(aSelectedControlTextColor);
-
aStyleSettings.SetButtonPressedRolloverTextColor(aSelectedControlTextColor);
-
aStyleSettings.SetDefaultActionButtonPressedRolloverTextColor(aSelectedControlTextColor);
-
aStyleSettings.SetActionButtonPressedRolloverTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetDefaultButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
+
aStyleSettings.SetButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
+
aStyleSettings.SetDefaultActionButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
+
aStyleSettings.SetActionButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetFlatButtonPressedRolloverTextColor(aControlTextColor);
 
-// Set text colors for tabs according to OS settings, typically white for 
selected buttons, black otherwise
+// Set text colors for tabs according to OS settings
 
 aStyleSettings.SetTabTextColor(aControlTextColor);
-aStyleSettings.SetTabHighlightTextColor(aSelectedControlTextColor);
+
+// FIXME: Starting with macOS Big Sur, coloring has changed. Currently 
there is no documentation which system color should be
+// used for selected tab text. As a workaround the current OS version has 
to be considered. This code has to be reviewed once
+// issue is covered by documentation.
+
+NSOperatingSystemVersion aOSVersion = { .majorVersion = 11, .minorVersion 
= 0, .patchVersion = 0 };
+if ([NSProcessInfo.processInfo isOperatingSystemAtLeastVersion: 
aOSVersion])
+aStyleSettings.SetTabHighlightTextColor(aSelectedControlTextColor);
+else
+
aStyleSettings.SetTabHighlightTextColor(aAlternateSelectedControlTextColor);
 
 aStyleSettings.SetCursorBlinkTime( mnBlinkCursorDelay );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Jim Raykowski (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 
   4 ++--
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu   | 
   2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 23746af5b76d55ce781c8b9b58bfd566805b14ed
Author: Jim Raykowski 
AuthorDate: Sun Jan 17 14:54:55 2021 -0900
Commit: Jim Raykowski 
CommitDate: Mon Jan 18 07:41:58 2021 +0100

tdf#115817 Make the Navigation toolbar persist

This patch makes the Navigation (navigationobjectbar) toolbar reappear
when Writer is started if it was displayed in the toolbar layout when
Writer was ended.

Change-Id: I71ddf85daf98720f7c5fd29462d1a2bcb48114d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109503
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 68f272c16e3e..2c0ad8fec34b 100644
--- 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -742,7 +742,7 @@
   0
 
 
-  0,1
+  0,2
 
 
   true
@@ -757,7 +757,7 @@
   false
 
 
-  false
+  true
 
   
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 76373392b26b..acdf66df79e2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -829,7 +829,7 @@
   0
 
 
-  0,1
+  0,2
 
 
   true
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 include/svx/devtools/DocumentModelTreeHandler.hxx|   21 
 svx/source/devtools/DevelopmentToolDockingWindow.cxx |7 
 svx/source/devtools/DocumentModelTreeHandler.cxx |  799 +++
 svx/uiconfig/ui/developmenttool.ui   |6 
 4 files changed, 483 insertions(+), 350 deletions(-)

New commits:
commit 36b17f030777219e69412733feb250b8de5af9ef
Author: Tomaž Vajngerl 
AuthorDate: Mon Jan 18 08:17:01 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Jan 18 07:09:18 2021 +0100

devtools: handle the doc. model tree with attached obects

Instead of filling the document model tree with fill* methods,
refactor that to use objects that are attached (via get_id) to the
tree nodes directly. For this introduce DocumentModelTreeEntry
and subclasses, which implement what the current UNO object is
that is being shown for a tree node and a "fill" virtual method,
which is used to fill the child nodes of the tree when expanding
a tree node.

This makes the code much easier to work with and in addition it
makes it possible to have all the tree nodes to fill the content
on demand when expanded.

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

diff --git a/include/svx/devtools/DocumentModelTreeHandler.hxx 
b/include/svx/devtools/DocumentModelTreeHandler.hxx
index d85716562419..ca7cab62b0b2 100644
--- a/include/svx/devtools/DocumentModelTreeHandler.hxx
+++ b/include/svx/devtools/DocumentModelTreeHandler.hxx
@@ -24,25 +24,8 @@ private:
 std::unique_ptr& mpDocumentModelTree;
 css::uno::Reference mxDocument;
 
-std::unordered_map> 
maUnoObjectMap;
-
 void clearChildren(weld::TreeIter const& rParent);
 
-void fillSheets(weld::TreeIter const& rParent);
-void fillPages(weld::TreeIter const& rParent);
-void fillSlides(weld::TreeIter const& rParent);
-void fillMasterSlides(weld::TreeIter const& rParent);
-void fillParagraphs(weld::TreeIter const& rParent);
-void fillShapes(weld::TreeIter const& rParent);
-void fillTables(weld::TreeIter const& rParent);
-void fillFrames(weld::TreeIter const& rParent);
-void fillGraphicObjects(weld::TreeIter const& rParent);
-void fillOLEObjects(weld::TreeIter const& rParent);
-void fillStyleFamilies(weld::TreeIter const& rParent);
-
-void insertDocModelToParent(weld::TreeIter const& rParent, OUString const& 
rName,
-css::uno::Reference 
const& rInterface);
-
 public:
 DocumentModelTreeHandler(std::unique_ptr& 
pDocumentModelTree,
  css::uno::Reference const& 
xDocument)
@@ -56,7 +39,9 @@ public:
 DECL_LINK(ExpandingHandler, const weld::TreeIter&, bool);
 
 void inspectDocument();
-css::uno::Reference getObjectByID(OUString const& 
rID);
+static css::uno::Reference getObjectByID(OUString 
const& rID);
+
+void dispose();
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx 
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index f1ebbc355836..c09bc4035c6e 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -118,10 +118,10 @@ 
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* pInputBi
 }
 }
 
-IMPL_LINK_NOARG(DevelopmentToolDockingWindow, LeftSideSelected, 
weld::TreeView&, void)
+IMPL_LINK(DevelopmentToolDockingWindow, LeftSideSelected, weld::TreeView&, 
rView, void)
 {
-OUString sID = mpLeftSideTreeView->get_selected_text();
-auto xObject = maDocumentModelTreeHandler.getObjectByID(sID);
+OUString sID = rView.get_selected_id();
+auto xObject = DocumentModelTreeHandler::getObjectByID(sID);
 if (xObject.is())
 introspect(xObject);
 }
@@ -132,6 +132,7 @@ void DevelopmentToolDockingWindow::dispose()
 {
 mpClassNameLabel.reset();
 mpClassListBox.reset();
+maDocumentModelTreeHandler.dispose();
 mpLeftSideTreeView.reset();
 
 SfxDockingWindow::dispose();
diff --git a/svx/source/devtools/DocumentModelTreeHandler.cxx 
b/svx/source/devtools/DocumentModelTreeHandler.cxx
index 0aa93f8e0668..2c721dcbea8e 100644
--- a/svx/source/devtools/DocumentModelTreeHandler.cxx
+++ b/svx/source/devtools/DocumentModelTreeHandler.cxx
@@ -9,19 +9,18 @@
  */
 
 #include 
+
 #include 
 
 #include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
 #include 
-
-#include 
-#include 
-
 #include 
 #include 
 #include 
@@ -29,7 +28,6 @@
 #include 
 #include 
 #include 
-
 #include 
 #include 
 #include 
@@ -41,22 +39,21 @@ using namespace css;
 
 namespace
 {
-void lclAppendToParent(std::unique_ptr& rTree, weld::TreeIter 
const& rParent,
-   OUString const& rString, bool bChildrenOnDemand = false)
-{
-

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/shells/navsh.cxx |7 +++
 sw/source/uibase/wrtsh/navmgr.cxx |4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit cf98f078b0a4e8c36cf0579042442e5583013608
Author: Jim Raykowski 
AuthorDate: Sun Jan 17 16:16:10 2021 -0900
Commit: Jim Raykowski 
CommitDate: Mon Jan 18 04:49:10 2021 +0100

tdf#115817 set standard mode before recency navigation

Using Navigate-by to move through the recency stack sets the writer
shell to standard mode before navigation. Navigation using the Back and
Forward navigation controls does not. This results in incorrect
behaviour when a drawing object is selected and navigation is attempted.

This patch sets writer shell to standard mode before recency navigation
is done using .uno:NavigateBack and .uno:NavigateForward.

Change-Id: If05883e8188452736cfedac9153bcc91422bf7e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109504
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/shells/navsh.cxx 
b/sw/source/uibase/shells/navsh.cxx
index 5b5d071bee8d..6f864ec7c126 100644
--- a/sw/source/uibase/shells/navsh.cxx
+++ b/sw/source/uibase/shells/navsh.cxx
@@ -41,6 +41,13 @@ void SwNavigationShell::Execute(SfxRequest const& rReq)
 const SfxPoolItem* pItem;
 if (pArgs)
 pArgs->GetItemState(nSlotId, false, &pItem);
+
+if (pSdrView->IsTextEdit())
+pSh->EndTextEdit();
+if (pSh->GetView().IsDrawMode())
+pSh->GetView().LeaveDrawCreate();
+pSh->EnterStdMode();
+
 switch (nSlotId)
 {
 case FN_NAVIGATION_BACK:
diff --git a/sw/source/uibase/wrtsh/navmgr.cxx 
b/sw/source/uibase/wrtsh/navmgr.cxx
index 10130fbe4b4f..1960f831e4ee 100644
--- a/sw/source/uibase/wrtsh/navmgr.cxx
+++ b/sw/source/uibase/wrtsh/navmgr.cxx
@@ -20,12 +20,10 @@
 #include 
 #include 
 
-#include 
-
 // This method positions the cursor to the position rPos.
 
 void SwNavigationMgr::GotoSwPosition(const SwPosition &rPos) {
-m_rMyShell.GetView().GetEditWin().GrabFocus();
+
 // EnterStdMode() prevents the cursor to 'block' the current
 // shell when it should move from the image back to the normal shell
 m_rMyShell.EnterStdMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - sw/inc sw/source

[Samuel Mehrbrodt (via logerrit)]

 sw/inc/viewsh.hxx |4 ++--
 sw/source/uibase/uiview/view2.cxx |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b5dff6131058d3e98307c24bb5796d7dd2b589f8
Author: Samuel Mehrbrodt 
AuthorDate: Tue Jan 12 16:02:34 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Jan 18 03:54:19 2021 +0100

Make uno:RefreshView redo the whole document layout

This is useful when encountering layout problems, to refresh
the doc layout from an extension.

Change-Id: Ie2472f061ebea203a9d876782b3bb953477de7c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109218
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 0bc777f2dce8..06d45add7cbb 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -152,8 +152,6 @@ class SW_DLLPUBLIC SwViewShell : public 
sw::Ring
 
 inline void ResetInvalidRect();
 
-void Reformat();  // Invalidates complete Layout (ApplyViewOption).
-
 SAL_DLLPRIVATE void PaintDesktop(vcl::RenderContext& rRenderContext, const 
SwRect&);  // Collect values for painting of desktop
 // and calling.
 // PaintDesktop split. This pars is also used by PreviewPage.
@@ -216,6 +214,8 @@ public:
 
 void InvalidateWindows( const SwRect &rRect );
 
+void Reformat();  // Invalidates complete Layout (ApplyViewOption).
+
 // #i72754# set of Pre/PostPaints with lock counter and initial target 
OutDev
 protected:
 std::stack mPrePostPaintRegions; // acts also as a lock 
counter (empty == not locked)
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 4a76ca612eef..8ab119113225 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -532,6 +532,7 @@ void SwView::Execute(SfxRequest &rReq)
 break;
 case FN_REFRESH_VIEW:
 GetEditWin().Invalidate();
+m_pWrtShell->Reformat();
 break;
 case FN_PAGEUP:
 case FN_PAGEUP_SEL:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx officecfg/registry sc/sdi sc/source svx/sdi sw/inc sw/sdi sw/source

[Samuel Mehrbrodt (via logerrit)]

 include/svx/svxids.hrc   |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |5 --
 sc/sdi/docsh.sdi |2 +
 sc/source/ui/docshell/docsh3.cxx |5 ++
 sc/source/ui/docshell/docsh4.cxx |5 ++
 sc/source/ui/inc/docsh.hxx   |1 
 svx/sdi/svx.sdi  |   16 
+
 sw/inc/cmdid.h   |4 --
 sw/sdi/_viewsh.sdi   |2 -
 sw/sdi/swriter.sdi   |   17 
--
 sw/sdi/viewsh.sdi|2 -
 sw/source/uibase/uiview/pview.cxx|2 -
 sw/source/uibase/uiview/view2.cxx|2 -
 14 files changed, 40 insertions(+), 29 deletions(-)

New commits:
commit 0da5e6f38aedb1fb873d1a90c506f6ab03ab1656
Author: Samuel Mehrbrodt 
AuthorDate: Wed Jan 13 13:50:39 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Jan 18 03:53:50 2021 +0100

Bring uno:RefreshView to Calc

Allow refreshing the document layout via UNO slot

Change-Id: I956bb884b1fb4231b1f617c4aa5a80ff9a45ec92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109230
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 82c6364d9a7e..844b23db5cf3 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -688,6 +688,7 @@ class SdrAngleItem;
 #define SID_FM_SHOW_DATANAVIGATOR   ( SID_SVX_START + 773 )
 #define SID_FM_DATANAVIGATOR_CONTROL( SID_SVX_START + 774 )
 #define SID_FM_REFRESH_FORM_CONTROL ( SID_SVX_START + 775 )
+#define SID_REFRESH_VIEW( SID_SVX_START + 776 )
 
 // CAUTION! Range <855 .. 855> used by EditEngine (!)
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index fadfcb966638..1db21b1af629 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5963,6 +5963,11 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   1
 
   
+  
+
+  Refresh document layout
+
+  
   
 
   Find Record...
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 76f453d7d816..31286da7a6fb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2595,11 +2595,6 @@
   1
 
   
-  
-
-  Refresh document layout
-
-  
   
 
   Directly to Document End
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 99019d55ff6f..e1dd9a1aee0a 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -77,6 +77,8 @@ interface TableDocument
 SID_LANGUAGE_STATUS [ ExecMethod = Execute; StateMethod = GetState; ]
 SID_SPELLCHECK_IGNORE_ALL [ ExecMethod = Execute; StateMethod = 
GetState; ]
 SID_SPELLCHECK_APPLY_SUGGESTION [ ExecMethod = Execute; StateMethod = 
GetState; ]
+
+SID_REFRESH_VIEW[ ExecMethod = Execute; StateMethod = GetState; ]
 }
 
 
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index a31d73e5802c..9891d7ecf242 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -177,6 +177,11 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, 
PaintPartFlags nPart, sa
 }
 }
 
+void ScDocShell::PostPaintAll()
+{
+PostPaint(0, 0, 0, m_aDocument.MaxCol(), m_aDocument.MaxRow(), MAXTAB, 
PaintPartFlags::All);
+}
+
 void ScDocShell::PostPaintGridAll()
 {
 PostPaint( 0,0,0, m_aDocument.MaxCol(),m_aDocument.MaxRow(),MAXTAB, 
PaintPartFlags::Grid );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 055db3ac7a11..19ba7680a1fe 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1329,6 +1329,11 @@ void ScDocShell::Execute( SfxRequest& rReq )
 }
 }
 break;
+case SID_REFRESH_VIEW:
+{
+PostPaintGridAll();
+}
+break;
 default:
 {
 // small (?) hack -> forwarding of the slots to TabViewShell
diff --git a/sc/s

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/newglobaldoc.png |binary
 icon-themes/elementary/cmd/lc_newglobaldoc.png |binary
 icon-themes/elementary/cmd/sc_newglobaldoc.png |binary
 icon-themes/elementary/sw/res/sc20247.png  |binary
 icon-themes/elementary/sw/res/sc20248.png  |binary
 icon-themes/elementary/sw/res/sr20012.png  |binary
 icon-themes/elementary_svg/cmd/32/newglobaldoc.svg |1 +
 icon-themes/elementary_svg/cmd/lc_newglobaldoc.svg |1 +
 icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg |2 +-
 icon-themes/elementary_svg/sw/res/sc20247.svg  |2 +-
 icon-themes/elementary_svg/sw/res/sc20248.svg  |2 +-
 icon-themes/elementary_svg/sw/res/sr20012.svg  |2 +-
 12 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6c76f1a90f926bf056d41e60a3375611baf72e2a
Author: Rizal Muttaqin 
AuthorDate: Mon Jan 18 04:36:59 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Jan 18 03:36:31 2021 +0100

elementary: tdf#139056 update many colors to follow upstream brand

Change-Id: I4ef4bdb43e48f740ee2075627610e13142316434
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109490
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/newglobaldoc.png 
b/icon-themes/elementary/cmd/32/newglobaldoc.png
new file mode 100644
index ..b88106f85e9f
Binary files /dev/null and b/icon-themes/elementary/cmd/32/newglobaldoc.png 
differ
diff --git a/icon-themes/elementary/cmd/lc_newglobaldoc.png 
b/icon-themes/elementary/cmd/lc_newglobaldoc.png
new file mode 100644
index ..3829de581099
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_newglobaldoc.png 
differ
diff --git a/icon-themes/elementary/cmd/sc_newglobaldoc.png 
b/icon-themes/elementary/cmd/sc_newglobaldoc.png
index 1be9bd0ef58f..c1cd37535b0d 100644
Binary files a/icon-themes/elementary/cmd/sc_newglobaldoc.png and 
b/icon-themes/elementary/cmd/sc_newglobaldoc.png differ
diff --git a/icon-themes/elementary/sw/res/sc20247.png 
b/icon-themes/elementary/sw/res/sc20247.png
index eaba7319cad3..f4c20e064bb9 100644
Binary files a/icon-themes/elementary/sw/res/sc20247.png and 
b/icon-themes/elementary/sw/res/sc20247.png differ
diff --git a/icon-themes/elementary/sw/res/sc20248.png 
b/icon-themes/elementary/sw/res/sc20248.png
index cb871420e775..93942a6fef7d 100644
Binary files a/icon-themes/elementary/sw/res/sc20248.png and 
b/icon-themes/elementary/sw/res/sc20248.png differ
diff --git a/icon-themes/elementary/sw/res/sr20012.png 
b/icon-themes/elementary/sw/res/sr20012.png
index 37b82a9a8850..ebdbc3ca7da6 100644
Binary files a/icon-themes/elementary/sw/res/sr20012.png and 
b/icon-themes/elementary/sw/res/sr20012.png differ
diff --git a/icon-themes/elementary_svg/cmd/32/newglobaldoc.svg 
b/icon-themes/elementary_svg/cmd/32/newglobaldoc.svg
new file mode 100644
index ..6502b85505d4
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/32/newglobaldoc.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";><
 path d="m4.4999609.5707c5.270486 0 23.511.0018 23.511.0018l.27 
28.99823193s-15.85 0-23.781 0c0-9.93 0-19.86 0-29.7793z" 
fill="url(#k)" stroke="url(#l)" stroke-linejoin="round" 
stroke-width=".22"/>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/lc_newglobaldoc.svg 
b/icon-themes/elementary_svg/cmd/lc_newglobaldoc.svg
new file mode 100644
index ..1624971da04e
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/lc_newglobaldoc.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg 
b/icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg
index c77ae02f850a..4b76fd6a82e1 100644
--- a/icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg
+++ b/icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/sw/res/sc20247.svg 
b/icon-themes/elementary_svg/sw/res/sc20247.svg
index 6f9a0df738fa..7b8db25b8c78 100644
--- a/icon-themes/elementary_svg/sw/res/sc20247.svg
+++ b/icon-themes/elementary_svg/sw/res/sc20247.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/sw/res/sc20248.svg 
b/icon-themes/elementary_svg/sw/res/sc20248.svg
index 85d3c8568dff..5f8720b71263 100644
--- a/icon-themes/elementary_svg/sw/res/sc20248.svg
+++ b/icon-themes/elementary_svg/sw/res/sc20248.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/printpreview.png |binary
 icon-themes/elementary/cmd/lc_printpreview.png |binary
 icon-themes/elementary/cmd/sc_printpreview.png |binary
 icon-themes/elementary_svg/cmd/32/printpreview.svg |2 +-
 icon-themes/elementary_svg/cmd/lc_printpreview.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_printpreview.svg |2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2dea6b861f62914eeab98b019a2f11d68ead4bf8
Author: Rizal Muttaqin 
AuthorDate: Mon Jan 18 05:25:42 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Jan 18 03:35:57 2021 +0100

elementary: tdf#139047 redesign find (Print Preview)

Change-Id: I35b0b32ebc988f80f2f204e5570b74e708b33852
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109492
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/printpreview.png 
b/icon-themes/elementary/cmd/32/printpreview.png
index fdbe28e21af7..9950ff4b89f6 100644
Binary files a/icon-themes/elementary/cmd/32/printpreview.png and 
b/icon-themes/elementary/cmd/32/printpreview.png differ
diff --git a/icon-themes/elementary/cmd/lc_printpreview.png 
b/icon-themes/elementary/cmd/lc_printpreview.png
index 27a2362e185d..3a8e4729c8cf 100644
Binary files a/icon-themes/elementary/cmd/lc_printpreview.png and 
b/icon-themes/elementary/cmd/lc_printpreview.png differ
diff --git a/icon-themes/elementary/cmd/sc_printpreview.png 
b/icon-themes/elementary/cmd/sc_printpreview.png
index 22427d2f2906..135e75922476 100644
Binary files a/icon-themes/elementary/cmd/sc_printpreview.png and 
b/icon-themes/elementary/cmd/sc_printpreview.png differ
diff --git a/icon-themes/elementary_svg/cmd/32/printpreview.svg 
b/icon-themes/elementary_svg/cmd/32/printpreview.svg
index c59a339ef1a2..f53b9d817ffb 100644
--- a/icon-themes/elementary_svg/cmd/32/printpreview.svg
+++ b/icon-themes/elementary_svg/cmd/32/printpreview.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/lc_printpreview.svg 
b/icon-themes/elementary_svg/cmd/lc_printpreview.svg
index 9737b7e412e5..3de9166f1a24 100644
--- a/icon-themes/elementary_svg/cmd/lc_printpreview.svg
+++ b/icon-themes/elementary_svg/cmd/lc_printpreview.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_printpreview.svg 
b/icon-themes/elementary_svg/cmd/sc_printpreview.svg
index 909ade86db13..f290796d070c 100644
--- a/icon-themes/elementary_svg/cmd/sc_printpreview.svg
+++ b/icon-themes/elementary_svg/cmd/sc_printpreview.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";><
 linearGradient id="h" gradientTransform="matrix(.24324324 0 0 .35135133 
2.162164 -.432428)" gradientUnits="userSpaceOnUse" x1="23.9" x2="23.9" 
y1="6.923065" y2="41.076912">
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 include/svx/devtools/DevelopmentToolDockingWindow.hxx |   52 ++-
 svx/source/devtools/DevelopmentToolDockingWindow.cxx  |  296 --
 2 files changed, 181 insertions(+), 167 deletions(-)

New commits:
commit cc5f7625574a4181afd617f69a1e6bfb65918e6f
Author: Tomaž Vajngerl 
AuthorDate: Sun Jan 17 20:32:13 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Jan 18 03:35:06 2021 +0100

devtools: separate handling of document model tree into own class

This introduces DocumentModelTreeHandler which is used to handle
the left-side document model tree. This makes it easier to track
how the tree is populated and handled by encapsulation.

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

diff --git a/include/svx/devtools/DevelopmentToolDockingWindow.hxx 
b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
index 4676a77a5466..addfec5d23ef 100644
--- a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
@@ -20,24 +20,14 @@
 
 #include 
 
-class SAL_WARN_UNUSED SVX_DLLPUBLIC DevelopmentToolDockingWindow final : 
public SfxDockingWindow
+class SVX_DLLPUBLIC DocumentModelTreeHandler
 {
 private:
-std::unique_ptr mpClassNameLabel;
-std::unique_ptr mpClassListBox;
-std::unique_ptr mpLeftSideTreeView;
-
-css::uno::Reference mxRoot;
-OUString msDocumentType;
+std::unique_ptr& mpDocumentModelTree;
+css::uno::Reference mxDocument;
 
 std::unordered_map> 
maUnoObjectMap;
 
-DECL_LINK(ModelTreeViewExpanding, const weld::TreeIter&, bool);
-
-DECL_LINK(LeftSideSelected, weld::TreeView&, void);
-
-void inspectDocument();
-
 void clearChildren(weld::TreeIter const& rParent);
 
 void fillSheets(weld::TreeIter const& rParent);
@@ -52,6 +42,42 @@ private:
 void fillOLEObjects(weld::TreeIter const& rParent);
 void fillStyleFamilies(weld::TreeIter const& rParent);
 
+void insertDocModelToParent(weld::TreeIter const& rParent, OUString const& 
rName,
+css::uno::Reference 
const& rInterface);
+
+public:
+DocumentModelTreeHandler(std::unique_ptr& 
pDocumentModelTree,
+ css::uno::Reference const& 
xDocument)
+: mpDocumentModelTree(pDocumentModelTree)
+, mxDocument(xDocument)
+{
+mpDocumentModelTree->connect_expanding(
+LINK(this, DocumentModelTreeHandler, ExpandingHandler));
+}
+
+DECL_LINK(ExpandingHandler, const weld::TreeIter&, bool);
+
+void inspectDocument();
+css::uno::Reference getObjectByID(OUString const& 
rID);
+};
+
+class SVX_DLLPUBLIC DevelopmentToolDockingWindow final : public 
SfxDockingWindow
+{
+private:
+std::unique_ptr mpClassNameLabel;
+std::unique_ptr mpClassListBox;
+
+std::unique_ptr mpLeftSideTreeView;
+
+css::uno::Reference mxRoot;
+OUString msDocumentType;
+
+DocumentModelTreeHandler maDocumentModelTreeHandler;
+
+DECL_LINK(LeftSideSelected, weld::TreeView&, void);
+
+void inspectDocument();
+
 public:
 DevelopmentToolDockingWindow(SfxBindings* pBindings, SfxChildWindow* 
pChildWindow,
  vcl::Window* pParent);
diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx 
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index 4bfd6df94463..8bb161b910ee 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -136,59 +136,44 @@ OUString lclGetNamed(uno::Reference 
const& xObject)
 
 } // end anonymous namespace
 
-DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* 
pInputBindings,
-   SfxChildWindow* 
pChildWindow,
-   vcl::Window* 
pParent)
-: SfxDockingWindow(pInputBindings, pChildWindow, pParent, 
"DevelopmentTool",
-   "svx/ui/developmenttool.ui")
-, mpClassNameLabel(m_xBuilder->weld_label("class_name_value_id"))
-, mpClassListBox(m_xBuilder->weld_tree_view("class_listbox_id"))
-, mpLeftSideTreeView(m_xBuilder->weld_tree_view("leftside_treeview_id"))
+uno::Reference 
DocumentModelTreeHandler::getObjectByID(OUString const& rID)
 {
-mpLeftSideTreeView->connect_changed(LINK(this, 
DevelopmentToolDockingWindow, LeftSideSelected));
-mpLeftSideTreeView->connect_expanding(
-LINK(this, DevelopmentToolDockingWindow, ModelTreeViewExpanding));
-
-auto* pViewFrame = pInputBindings->GetDispatcher()->GetFrame();
-
-uno::Reference xController = 
pViewFrame->GetFrame().GetController();
-
-mxRoot = 
pInputBindings->GetDispatcher()->GetFrame()->GetObjectShell()->GetBaseModel();
-
-introspect(mxRoot);
-inspectDocument();
+uno::Reference xObject;
+if (maUnoObjec

Infra call on Tue, Jan 19 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d "Tue, 19 Jan 2021 17:30 UTC"`
(18:30 Berlin time).

We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes
to https://pad.documentfoundation.org/p/infra .  Agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/printpreview.png |binary
 icon-themes/elementary/cmd/lc_printpreview.png |binary
 icon-themes/elementary/cmd/sc_printpreview.png |binary
 icon-themes/elementary_svg/cmd/32/printpreview.svg |2 +-
 icon-themes/elementary_svg/cmd/lc_printpreview.svg |2 +-
 icon-themes/elementary_svg/cmd/sc_printpreview.svg |2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ef336f71780eb62cfdfe0091cc0656622884993b
Author: Rizal Muttaqin 
AuthorDate: Mon Jan 18 05:25:42 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Jan 18 01:58:29 2021 +0100

elementary: tdf#139047 redesign find (Print Preview)

Change-Id: I35b0b32ebc988f80f2f204e5570b74e708b33852
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109512
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/printpreview.png 
b/icon-themes/elementary/cmd/32/printpreview.png
index fdbe28e21af7..9950ff4b89f6 100644
Binary files a/icon-themes/elementary/cmd/32/printpreview.png and 
b/icon-themes/elementary/cmd/32/printpreview.png differ
diff --git a/icon-themes/elementary/cmd/lc_printpreview.png 
b/icon-themes/elementary/cmd/lc_printpreview.png
index 27a2362e185d..3a8e4729c8cf 100644
Binary files a/icon-themes/elementary/cmd/lc_printpreview.png and 
b/icon-themes/elementary/cmd/lc_printpreview.png differ
diff --git a/icon-themes/elementary/cmd/sc_printpreview.png 
b/icon-themes/elementary/cmd/sc_printpreview.png
index 22427d2f2906..135e75922476 100644
Binary files a/icon-themes/elementary/cmd/sc_printpreview.png and 
b/icon-themes/elementary/cmd/sc_printpreview.png differ
diff --git a/icon-themes/elementary_svg/cmd/32/printpreview.svg 
b/icon-themes/elementary_svg/cmd/32/printpreview.svg
index c59a339ef1a2..f53b9d817ffb 100644
--- a/icon-themes/elementary_svg/cmd/32/printpreview.svg
+++ b/icon-themes/elementary_svg/cmd/32/printpreview.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/lc_printpreview.svg 
b/icon-themes/elementary_svg/cmd/lc_printpreview.svg
index 9737b7e412e5..3de9166f1a24 100644
--- a/icon-themes/elementary_svg/cmd/lc_printpreview.svg
+++ b/icon-themes/elementary_svg/cmd/lc_printpreview.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_printpreview.svg 
b/icon-themes/elementary_svg/cmd/sc_printpreview.svg
index 909ade86db13..f290796d070c 100644
--- a/icon-themes/elementary_svg/cmd/sc_printpreview.svg
+++ b/icon-themes/elementary_svg/cmd/sc_printpreview.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";><
 linearGradient id="h" gradientTransform="matrix(.24324324 0 0 .35135133 
2.162164 -.432428)" gradientUnits="userSpaceOnUse" x1="23.9" x2="23.9" 
y1="6.923065" y2="41.076912">
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/ar/lc_alphaliststyle.png|binary
 icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png |binary
 icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png |binary
 icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png|binary
 icon-themes/elementary/cmd/ar/lc_numberingstart.png|binary
 icon-themes/elementary/cmd/ar/lc_outlinebullet.png |binary
 icon-themes/elementary/cmd/ar/lc_romanliststyle.png|binary
 icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png |binary
 icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg|2 +-
 icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg |2 +-
 icon-themes/elementary_svg/cmd/ar/lc_bulletsandnumberingdialog.svg |2 +-
 icon-themes/elementary_svg/cmd/ar/lc_insertneutralparagraph.svg|2 +-
 icon-themes/elementary_svg/cmd/ar/lc_numberingstart.svg|2 +-
 icon-themes/elementary_svg/cmd/ar/lc_outlinebullet.svg |2 +-
 icon-themes/elementary_svg/cmd/ar/lc_romanliststyle.svg|2 +-
 icon-themes/elementary_svg/cmd/ar/lc_romanlowliststyle.svg |2 +-
 16 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 2081eac430ac69619149e44b453a2d7dda41fc83
Author: Rizal Muttaqin 
AuthorDate: Mon Jan 18 04:26:48 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Jan 18 01:57:37 2021 +0100

elementary: tdf#70102 repir RTL bullet numbering icons

Change-Id: I16d7133cfdc75758ec9df34bdd6d0d6b174fb620
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109489
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/ar/lc_alphaliststyle.png 
b/icon-themes/elementary/cmd/ar/lc_alphaliststyle.png
index 82c6c8d0b20e..8be955e3c522 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_alphaliststyle.png and 
b/icon-themes/elementary/cmd/ar/lc_alphaliststyle.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png 
b/icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png
index 361b3ef8dbf6..c2a9fc6b3c26 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png and 
b/icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png 
b/icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png
index 42be3b61845a..46c79573ab6c 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png 
and b/icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png 
b/icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png
index 10589b304738..01c45c22f7f1 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png and 
b/icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_numberingstart.png 
b/icon-themes/elementary/cmd/ar/lc_numberingstart.png
index 000c1aa2634d..4a7319222046 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_numberingstart.png and 
b/icon-themes/elementary/cmd/ar/lc_numberingstart.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_outlinebullet.png 
b/icon-themes/elementary/cmd/ar/lc_outlinebullet.png
index 1658ce8f871f..d6b2eb4d5d88 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_outlinebullet.png and 
b/icon-themes/elementary/cmd/ar/lc_outlinebullet.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_romanliststyle.png 
b/icon-themes/elementary/cmd/ar/lc_romanliststyle.png
index d50799621fbf..59b9d5f2b550 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_romanliststyle.png and 
b/icon-themes/elementary/cmd/ar/lc_romanliststyle.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png 
b/icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png
index 810a02e2ff5d..8aa7c94af5a9 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png and 
b/icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png differ
diff --git a/icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg 
b/icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg
index 07ba1894a792..04c97f192ae3 100644
--- a/icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg
+++ b/icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg 
b/icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg
index 977cfa20a024..8c59fac6bb3c 100644
--- a/icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg
+++ b/icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg
@@ -1 +1 @@
-

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/crookrotate.png |binary
 icon-themes/elementary/cmd/32/crookslant.png  |binary
 icon-themes/elementary/res/base128.png|binary
 icon-themes/elementary/res/lx03245.png|binary
 icon-themes/elementary/res/odb_16_8.png   |binary
 icon-themes/elementary/res/odb_32_8.png   |binary
 icon-themes/elementary/res/odb_48_8.png   |binary
 icon-themes/elementary/sw/res/envhc_l.png |binary
 icon-themes/elementary/sw/res/envhc_u.png |binary
 icon-themes/elementary/sw/res/envhl_l.png |binary
 icon-themes/elementary/sw/res/envhl_u.png |binary
 icon-themes/elementary/sw/res/envhr_l.png |binary
 icon-themes/elementary/sw/res/envhr_u.png |binary
 icon-themes/elementary/sw/res/envvc_l.png |binary
 icon-themes/elementary/sw/res/envvc_u.png |binary
 icon-themes/elementary/sw/res/envvl_l.png |binary
 icon-themes/elementary/sw/res/envvl_u.png |binary
 icon-themes/elementary/sw/res/envvr_l.png |binary
 icon-themes/elementary/sw/res/envvr_u.png |binary
 icon-themes/elementary_svg/cmd/32/crookrotate.svg |2 +-
 icon-themes/elementary_svg/cmd/32/crookslant.svg  |2 +-
 icon-themes/elementary_svg/res/base128.svg|2 +-
 icon-themes/elementary_svg/res/lx03245.svg|2 +-
 icon-themes/elementary_svg/res/odb_16_8.svg   |2 +-
 icon-themes/elementary_svg/res/odb_32_8.svg   |2 +-
 icon-themes/elementary_svg/res/odb_48_8.svg   |2 +-
 icon-themes/elementary_svg/sw/res/envhc_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhc_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhl_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhl_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhr_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhr_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvc_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvc_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvl_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvl_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvr_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvr_u.svg |2 +-
 38 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 6f32e1d3ac231413a374f3ae4ff7e9f4726d7545
Author: Rizal Muttaqin 
AuthorDate: Sun Jan 17 15:16:11 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Jan 18 01:56:36 2021 +0100

elementary: tdf#139056 update VIOLET color to follow upstream brand

Change-Id: Ieb2b680bc698dc533ec47d1a7b4fd47b8074911d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109462
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/crookrotate.png 
b/icon-themes/elementary/cmd/32/crookrotate.png
index 53c863c01cc4..dce4b259a6e8 100644
Binary files a/icon-themes/elementary/cmd/32/crookrotate.png and 
b/icon-themes/elementary/cmd/32/crookrotate.png differ
diff --git a/icon-themes/elementary/cmd/32/crookslant.png 
b/icon-themes/elementary/cmd/32/crookslant.png
index 9ed58b0471af..986da1345b86 100644
Binary files a/icon-themes/elementary/cmd/32/crookslant.png and 
b/icon-themes/elementary/cmd/32/crookslant.png differ
diff --git a/icon-themes/elementary/res/base128.png 
b/icon-themes/elementary/res/base128.png
index 9d984d71298b..d01e76e105d0 100644
Binary files a/icon-themes/elementary/res/base128.png and 
b/icon-themes/elementary/res/base128.png differ
diff --git a/icon-themes/elementary/res/lx03245.png 
b/icon-themes/elementary/res/lx03245.png
index 6c9a1126203c..ef762eec737a 100644
Binary files a/icon-themes/elementary/res/lx03245.png and 
b/icon-themes/elementary/res/lx03245.png differ
diff --git a/icon-themes/elementary/res/odb_16_8.png 
b/icon-themes/elementary/res/odb_16_8.png
index af1ce1a29079..d3d39cdda120 100644
Binary files a/icon-themes/elementary/res/odb_16_8.png and 
b/icon-themes/elementary/res/odb_16_8.png differ
diff --git a/icon-themes/elementary/res/odb_32_8.png 
b/icon-themes/elementary/res/odb_32_8.png
index d31b9d2f10db..31b7acbbb6fa 100644
Binary files a/icon-themes/elementary/res/odb_32_8.png and 
b/icon-themes/elementary/res/odb_32_8.png differ
diff --git a/icon-themes/elementary/res/odb_48_8.png 
b/icon-themes/elementary/res/odb_48_8.png
index e48d07ffb28f..36950a407a4f 100644
Binary files a/icon-themes/elementary/res/odb_48_8.png and 
b/icon-themes/elementary/res/odb_48_8.png differ
diff --git a/icon-themes/elementary/sw/res/envhc_l.png 
b/icon-themes/elementary/sw/res/envhc_l.png
index 0f3dcd587401..0c6c5c8bfe35 100644
Binary files a/icon-themes/elementary/sw/res/envhc_l.png and 
b/icon-themes/elementary/sw/res/envhc_l.png differ
diff --git a/icon-themes/elementary/sw/res/envhc_u.png 
b/icon-themes/elementary/sw/res/envhc_u.png
index b10e257b7c31..e414ce8c3d2d 100644
Binary files a/icon-themes/elementary/sw/res/envhc_u.png and 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/newglobaldoc.png |binary
 icon-themes/elementary/cmd/lc_newglobaldoc.png |binary
 icon-themes/elementary/cmd/sc_newglobaldoc.png |binary
 icon-themes/elementary/sw/res/sc20247.png  |binary
 icon-themes/elementary/sw/res/sc20248.png  |binary
 icon-themes/elementary/sw/res/sr20012.png  |binary
 icon-themes/elementary_svg/cmd/32/newglobaldoc.svg |1 +
 icon-themes/elementary_svg/cmd/lc_newglobaldoc.svg |1 +
 icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg |2 +-
 icon-themes/elementary_svg/sw/res/sc20247.svg  |2 +-
 icon-themes/elementary_svg/sw/res/sc20248.svg  |2 +-
 icon-themes/elementary_svg/sw/res/sr20012.svg  |2 +-
 12 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6e87b696abf9051ad279f46b0f7a6178c8a7bea3
Author: Rizal Muttaqin 
AuthorDate: Mon Jan 18 04:36:59 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Jan 18 01:55:46 2021 +0100

elementary: tdf#139056 update many colors to follow upstream brand

Change-Id: I4ef4bdb43e48f740ee2075627610e13142316434
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109411
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/newglobaldoc.png 
b/icon-themes/elementary/cmd/32/newglobaldoc.png
new file mode 100644
index ..b88106f85e9f
Binary files /dev/null and b/icon-themes/elementary/cmd/32/newglobaldoc.png 
differ
diff --git a/icon-themes/elementary/cmd/lc_newglobaldoc.png 
b/icon-themes/elementary/cmd/lc_newglobaldoc.png
new file mode 100644
index ..3829de581099
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_newglobaldoc.png 
differ
diff --git a/icon-themes/elementary/cmd/sc_newglobaldoc.png 
b/icon-themes/elementary/cmd/sc_newglobaldoc.png
index 1be9bd0ef58f..c1cd37535b0d 100644
Binary files a/icon-themes/elementary/cmd/sc_newglobaldoc.png and 
b/icon-themes/elementary/cmd/sc_newglobaldoc.png differ
diff --git a/icon-themes/elementary/sw/res/sc20247.png 
b/icon-themes/elementary/sw/res/sc20247.png
index eaba7319cad3..f4c20e064bb9 100644
Binary files a/icon-themes/elementary/sw/res/sc20247.png and 
b/icon-themes/elementary/sw/res/sc20247.png differ
diff --git a/icon-themes/elementary/sw/res/sc20248.png 
b/icon-themes/elementary/sw/res/sc20248.png
index cb871420e775..93942a6fef7d 100644
Binary files a/icon-themes/elementary/sw/res/sc20248.png and 
b/icon-themes/elementary/sw/res/sc20248.png differ
diff --git a/icon-themes/elementary/sw/res/sr20012.png 
b/icon-themes/elementary/sw/res/sr20012.png
index 37b82a9a8850..ebdbc3ca7da6 100644
Binary files a/icon-themes/elementary/sw/res/sr20012.png and 
b/icon-themes/elementary/sw/res/sr20012.png differ
diff --git a/icon-themes/elementary_svg/cmd/32/newglobaldoc.svg 
b/icon-themes/elementary_svg/cmd/32/newglobaldoc.svg
new file mode 100644
index ..6502b85505d4
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/32/newglobaldoc.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";><
 path d="m4.4999609.5707c5.270486 0 23.511.0018 23.511.0018l.27 
28.99823193s-15.85 0-23.781 0c0-9.93 0-19.86 0-29.7793z" 
fill="url(#k)" stroke="url(#l)" stroke-linejoin="round" 
stroke-width=".22"/>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/lc_newglobaldoc.svg 
b/icon-themes/elementary_svg/cmd/lc_newglobaldoc.svg
new file mode 100644
index ..1624971da04e
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/lc_newglobaldoc.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg 
b/icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg
index c77ae02f850a..4b76fd6a82e1 100644
--- a/icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg
+++ b/icon-themes/elementary_svg/cmd/sc_newglobaldoc.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/sw/res/sc20247.svg 
b/icon-themes/elementary_svg/sw/res/sc20247.svg
index 6f9a0df738fa..7b8db25b8c78 100644
--- a/icon-themes/elementary_svg/sw/res/sc20247.svg
+++ b/icon-themes/elementary_svg/sw/res/sc20247.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/sw/res/sc20248.svg 
b/icon-themes/elementary_svg/sw/res/sc20248.svg
index 85d3c8568dff..5f8720b71263 100644
--- a/icon-themes/elementary_svg/sw/res/sc20248.svg
+++ b/icon-themes/elementary_svg/sw/res/sc20248.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/vcl vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/toolkit/roadmap.hxx  |2 +-
 vcl/inc/wizdlg.hxx   |2 +-
 vcl/source/app/salvtables.cxx|2 +-
 vcl/source/control/roadmap.cxx   |5 +++--
 vcl/source/control/roadmapwizard.cxx |4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 6c315bbeb16db9dcf157f24803cff7c51ec18ed8
Author: Caolán McNamara 
AuthorDate: Fri Jan 15 16:39:08 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 18 00:44:26 2021 +0100

tdf#138829 don't grab focus to roadmap label when sync timer fires

Change-Id: Icc8a03a2ce5d63f3a2c477671a9aa52aefd1df96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109351
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index c2654c1fd56e..7cfd6d7bd290 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -73,7 +73,7 @@ public:
 voidDeleteRoadmapItem( ItemIndex _nIndex );
 
 ItemId  GetCurrentRoadmapItemID() const;
-boolSelectRoadmapItemByID( ItemId _nItemID );
+boolSelectRoadmapItemByID(ItemId nItemID, bool bGrabFocus = 
true);
 
 voidSetItemSelectHdl( const Link& _rHdl );
 Link const & GetItemSelectHdl( ) const;
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 32a6401a6799..7c6af8636260 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -145,7 +145,7 @@ namespace vcl
 voidInsertRoadmapItem(int nIndex, const OUString& rLabel, 
int nId, bool bEnabled);
 voidDeleteRoadmapItems();
 int GetCurrentRoadmapItemID() const;
-voidSelectRoadmapItemByID(int nId);
+voidSelectRoadmapItemByID(int nId, bool bGrabFocus = true);
 voidSetItemSelectHdl( const Link& 
_rHdl );
 voidShowRoadmap(bool bShow);
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index e8dd4acd4808..b6e808ac9cc2 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1902,7 +1902,7 @@ IMPL_LINK_NOARG(SalInstanceAssistant, UpdateRoadmap_Hdl, 
Timer*, void)
 m_xWizard->InsertRoadmapItem(nPos++, rLabel, m_aIds[i], bSensitive);
 }
 
-m_xWizard->SelectRoadmapItemByID(m_aIds[get_current_page()]);
+m_xWizard->SelectRoadmapItemByID(m_aIds[get_current_page()], false);
 
 m_xWizard->ShowRoadmap(nPos != 0);
 
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index f1df11cff5bb..bc6a9c125de8 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -523,7 +523,7 @@ void ORoadmap::GetFocus()
 pCurHyperLabel->GrabFocus();
 }
 
-bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
+bool ORoadmap::SelectRoadmapItemByID(ItemId _nNewID, bool bGrabFocus)
 {
 DeselectOldRoadmapItems();
 RoadmapItem* pItem = GetByID( _nNewID );
@@ -534,7 +534,8 @@ bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
 const StyleSettings& rStyleSettings = 
GetSettings().GetStyleSettings();
 pItem->ToggleBackgroundColor( rStyleSettings.GetHighlightColor() 
); //HighlightColor
 
-pItem->GrabFocus();
+if (bGrabFocus)
+pItem->GrabFocus();
 m_pImpl->setCurItemID(_nNewID);
 
 Select();
diff --git a/vcl/source/control/roadmapwizard.cxx 
b/vcl/source/control/roadmapwizard.cxx
index d73cc1a18a5b..1b24e39cc4fc 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -827,9 +827,9 @@ namespace vcl
 m_xRoadmapImpl->pRoadmap->InsertRoadmapItem(nItemIndex, rText, 
nItemId, bEnable);
 }
 
-void RoadmapWizard::SelectRoadmapItemByID(int nItemId)
+void RoadmapWizard::SelectRoadmapItemByID(int nItemId, bool bGrabFocus)
 {
-m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(nItemId);
+m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(nItemId, bGrabFocus);
 }
 
 void RoadmapWizard::DeleteRoadmapItems()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/vcl vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/toolkit/roadmap.hxx  |2 +-
 vcl/inc/wizdlg.hxx   |2 +-
 vcl/source/app/salvtables.cxx|2 +-
 vcl/source/control/roadmap.cxx   |5 +++--
 vcl/source/control/roadmapwizard.cxx |4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit d11b11c39b2451b26daac4383d29eaa83dcc2bf5
Author: Caolán McNamara 
AuthorDate: Fri Jan 15 16:39:08 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 18 00:43:53 2021 +0100

tdf#138829 don't grab focus to roadmap label when sync timer fires

Change-Id: Icc8a03a2ce5d63f3a2c477671a9aa52aefd1df96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109392
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index c2654c1fd56e..7cfd6d7bd290 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -73,7 +73,7 @@ public:
 voidDeleteRoadmapItem( ItemIndex _nIndex );
 
 ItemId  GetCurrentRoadmapItemID() const;
-boolSelectRoadmapItemByID( ItemId _nItemID );
+boolSelectRoadmapItemByID(ItemId nItemID, bool bGrabFocus = 
true);
 
 voidSetItemSelectHdl( const Link& _rHdl );
 Link const & GetItemSelectHdl( ) const;
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 2c82b3ab8dd3..f728f2f5225f 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -145,7 +145,7 @@ namespace vcl
 voidInsertRoadmapItem(int nIndex, const OUString& rLabel, 
int nId, bool bEnabled);
 voidDeleteRoadmapItems();
 int GetCurrentRoadmapItemID() const;
-voidSelectRoadmapItemByID(int nId);
+voidSelectRoadmapItemByID(int nId, bool bGrabFocus = true);
 voidSetItemSelectHdl( const Link& 
_rHdl );
 voidShowRoadmap(bool bShow);
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index d7c93164a676..758473e5b69c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1824,7 +1824,7 @@ IMPL_LINK_NOARG(SalInstanceAssistant, UpdateRoadmap_Hdl, 
Timer*, void)
 m_xWizard->InsertRoadmapItem(nPos++, rLabel, m_aIds[i], bSensitive);
 }
 
-m_xWizard->SelectRoadmapItemByID(m_aIds[get_current_page()]);
+m_xWizard->SelectRoadmapItemByID(m_aIds[get_current_page()], false);
 
 m_xWizard->ShowRoadmap(nPos != 0);
 
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index 9f7e6a0e12ef..1658869cfca7 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -523,7 +523,7 @@ void ORoadmap::GetFocus()
 pCurHyperLabel->GrabFocus();
 }
 
-bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
+bool ORoadmap::SelectRoadmapItemByID(ItemId _nNewID, bool bGrabFocus)
 {
 DeselectOldRoadmapItems();
 RoadmapItem* pItem = GetByID( _nNewID );
@@ -534,7 +534,8 @@ bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
 const StyleSettings& rStyleSettings = 
GetSettings().GetStyleSettings();
 pItem->ToggleBackgroundColor( rStyleSettings.GetHighlightColor() 
); //HighlightColor
 
-pItem->GrabFocus();
+if (bGrabFocus)
+pItem->GrabFocus();
 m_pImpl->setCurItemID(_nNewID);
 
 Select();
diff --git a/vcl/source/control/roadmapwizard.cxx 
b/vcl/source/control/roadmapwizard.cxx
index d73cc1a18a5b..1b24e39cc4fc 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -827,9 +827,9 @@ namespace vcl
 m_xRoadmapImpl->pRoadmap->InsertRoadmapItem(nItemIndex, rText, 
nItemId, bEnable);
 }
 
-void RoadmapWizard::SelectRoadmapItemByID(int nItemId)
+void RoadmapWizard::SelectRoadmapItemByID(int nItemId, bool bGrabFocus)
 {
-m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(nItemId);
+m_xRoadmapImpl->pRoadmap->SelectRoadmapItemByID(nItemId, bGrabFocus);
 }
 
 void RoadmapWizard::DeleteRoadmapItems()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - svtools/uiconfig vcl/uiconfig vcl/unx

[Caolán McNamara (via logerrit)]

 svtools/uiconfig/ui/combocontrol.ui |4 
 svtools/uiconfig/ui/listcontrol.ui  |3 +++
 vcl/uiconfig/ui/combobox.ui |1 +
 vcl/unx/gtk3/gtk3gtkdata.cxx|   13 +
 vcl/unx/gtk3/gtk3gtkinst.cxx|4 
 5 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 868a7a160b9981e6b7f4a5a2242567288c84b36e
Author: Caolán McNamara 
AuthorDate: Fri Jan 15 15:34:21 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 18 00:43:05 2021 +0100

tdf#137695 shrink widget height below natural min within data browser

Change-Id: Iba3c12376200b7ce800b48155a4b84ca2e47d63f

Change-Id: Iba3c12376200b7ce800b48155a4b84ca2e47d63f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109382
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svtools/uiconfig/ui/combocontrol.ui 
b/svtools/uiconfig/ui/combocontrol.ui
index b3a8ee9e971c..43b0d15556db 100644
--- a/svtools/uiconfig/ui/combocontrol.ui
+++ b/svtools/uiconfig/ui/combocontrol.ui
@@ -15,8 +15,12 @@
 
   
 True
+False
   
 
+
+  
+
   
   
 True
diff --git a/svtools/uiconfig/ui/listcontrol.ui 
b/svtools/uiconfig/ui/listcontrol.ui
index f814e31dd41d..0602a80443f9 100644
--- a/svtools/uiconfig/ui/listcontrol.ui
+++ b/svtools/uiconfig/ui/listcontrol.ui
@@ -11,6 +11,9 @@
 True
 False
 True
+
+  
+
   
   
 True
diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui
index 24b07878f69b..6777506192a5 100644
--- a/vcl/uiconfig/ui/combobox.ui
+++ b/vcl/uiconfig/ui/combobox.ui
@@ -3,6 +3,7 @@
 
   
   
+combobox
 True
 False
 True
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index dce8a5b29ed3..c4e64d258481 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -522,14 +522,19 @@ void GtkSalData::Init()
   G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() );
 
 /*
-   set a provider to allow certain buttons to have no padding
+   set a provider to allow certain widgets to have no padding
 
a) little close button in menubar to close back to start-center
-   b) small buttons in view->data sources
-   c) small toolbar button in infobars
+   b) and small buttons in view->data sources (button.small-button)
+   c) small toolbar button in infobars (toolbar.small-button button)
+   d) comboboxes in the data browser for tdf#137695 (box#combobox 
button.small-button,
+  which would instead be combobox button.small-button if we didn't 
replace GtkComboBox,
+  see GtkInstanceComboBox for an explanation for why we do that)
+   e) entry in the data browser for tdf#137695 (entry.small-button)
 */
 GtkCssProvider* pSmallButtonProvider = gtk_css_provider_new();
-static const gchar data[] = "button.small-button, toolbar.small-button 
button { "
+static const gchar data[] =
+  "button.small-button, toolbar.small-button button, 
combobox.small-button *.combo, box#combobox.small-button *.combo, 
entry.small-button { "
   "padding: 0;"
   "margin-left: 0px;"
   "margin-right: 0px;"
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index cefec3415d62..e59e2a5ee9b0 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -14138,6 +14138,10 @@ public:
 , m_nMaxMRUCount(0)
 {
 int nActive = gtk_combo_box_get_active(m_pComboBox);
+
+if 
(gtk_style_context_has_class(gtk_widget_get_style_context(GTK_WIDGET(m_pComboBox)),
 "small-button"))
+
gtk_style_context_add_class(gtk_widget_get_style_context(GTK_WIDGET(getContainer())),
 "small-button");
+
 insertAsParent(GTK_WIDGET(m_pComboBox), GTK_WIDGET(getContainer()));
 gtk_widget_set_visible(GTK_WIDGET(m_pComboBox), false);
 gtk_widget_set_no_show_all(GTK_WIDGET(m_pComboBox), true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/ios vcl/osx vcl/quartz

[Tor Lillqvist (via logerrit)]

 vcl/ios/salios.cxx|   18 --
 vcl/osx/salmacos.cxx  |   16 
 vcl/quartz/salbmp.cxx |1 -
 3 files changed, 35 deletions(-)

New commits:
commit fdcf4418e9acfe4e95000b9d12a182d6702d42b6
Author: Tor Lillqvist 
AuthorDate: Sun Jan 17 22:13:39 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Jan 18 00:35:42 2021 +0100

Clean up includes a bit for iOS and macOS

Change-Id: I1dc6256968503ee3865f90e3693acce911a1d65c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109485
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/ios/salios.cxx b/vcl/ios/salios.cxx
index 625fcb049a09..59474c7443eb 100644
--- a/vcl/ios/salios.cxx
+++ b/vcl/ios/salios.cxx
@@ -25,25 +25,7 @@
 #include 
 #include 
 
-#include 
-#include 
-
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
 
 #include 
 #include 
diff --git a/vcl/osx/salmacos.cxx b/vcl/osx/salmacos.cxx
index 7d4569d65bca..9efe4dcb8003 100644
--- a/vcl/osx/salmacos.cxx
+++ b/vcl/osx/salmacos.cxx
@@ -25,21 +25,7 @@
 #include 
 #include 
 
-#include 
-#include 
-
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
 
 #include 
 #include 
@@ -47,8 +33,6 @@
 #include 
 
 #include 
-#include 
-#include 
 
 // From salbmp.cxx
 
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index a1570dd04ffb..f50c81c3b637 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -25,7 +25,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/Executable_soffice_bin.mk solenv/clang-format vcl/inc vcl/ios vcl/Library_vcl.mk vcl/Library_vclplug_osx.mk vcl/osx vcl/quart

[Thorsten Wagner (via logerrit)]

 desktop/Executable_soffice_bin.mk |   13 -
 solenv/clang-format/blacklist |4 
 vcl/Library_vcl.mk|1 
 vcl/Library_vclplug_osx.mk|3 
 vcl/inc/quartz/salgdi.h   |   15 -
 vcl/ios/salios.cxx|  433 ++
 vcl/osx/salgdiutils.cxx   |   41 ++-
 vcl/osx/salinst.cxx   |   15 +
 vcl/osx/salmacos.cxx  |  383 +
 vcl/quartz/salbmp.cxx |   50 
 vcl/quartz/salgdi.cxx |8 
 vcl/quartz/salgdicommon.cxx   |  236 
 vcl/quartz/salvd.cxx  |  133 ---
 13 files changed, 894 insertions(+), 441 deletions(-)

New commits:
commit f55352d5e79980c358653d18008ac047dc3e0118
Author: Thorsten Wagner 
AuthorDate: Sun Jan 10 23:49:25 2021 +0100
Commit: Tor Lillqvist 
CommitDate: Mon Jan 18 00:25:20 2021 +0100

tdf#138122 Add window scaling for retina displays on macOS, plus fixes for 
iOS

(1) Remove hack to make application look as if being linked against SDK 
10.13

(2) Use quad storage size on virtual devices for displaying on retina 
displays thereafter

(3) Apply workaround to downsample bitmaps from scaled layers (to be 
implemented)

(4) Disable dark mode (to be implemented)

(5) Provide new environment variables:

VCL_MACOS_FORCE_WINDOW_SCALING:
window scaling on non retina displays

VCL_MACOS_FORCE_DARK_MODE:
enable dark mode (macOS 10.14, iOS 13 and newer)

VCL_MACOS_USE_SYSTEM_APPEARANCE:
use light mode or dark mode (macOS 10.14, iOS 13 and newer) as configured 
by system preferences

In this branch, this change also contains the below follow-up fix by
tml in order to pass Jenkins for iOS:

Make vcl compile again for iOS and make the Collabora Office iOS app
work again when built against a master build of core.

For now, keep the old versions of the functions touched by [this
change] in vcl/ios/salios.cxx, and move the modified versions to the
new file vcl/osx/salmacos.cxx.

Keep the functions as they were except that ifdefs for MACOSX or IOS
are expanded. Keep the formatting as it was to make comparisons
easier. Thus add the new files to the clang-format exclusion list.

While at it, also move vcl/quartz/salgdiutils.cxx to vcl/osx as it is
compiled only for macOS anyway.

Change-Id: I99877cd62a98cb91bcbf27af62b043c31c5f5fc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109072
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109493
Tested-by: Jenkins CollaboraOffice 

diff --git a/desktop/Executable_soffice_bin.mk 
b/desktop/Executable_soffice_bin.mk
index ecf75893ab96..cabd31af29f2 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -31,19 +31,6 @@ $(eval $(call gb_Executable_set_ldflags,\
 
 endif
 
-ifeq ($(OS)-$(HAVE_MACOS_LD_PLATFORMVERSION),MACOSX-TRUE)
-# At least when building against SDK 10.15, changing the LC_VERSION_MIN_MACOSX 
load command's sdk
-# value from 10.15 to "n/a" (i.e., 0.0.0) is necessary to avoid blurry text in 
the LO UI (see
-# 

-# "[driver][darwin] Pass -platform_version flag to the linker instead of the
-# -_version_min flag", 
clang/test/Driver/darwin-ld-platform-version-macos.c in particular,
-# for the -platform_version that Clang passes by default to new-enough ld):
-$(eval $(call gb_Executable_add_ldflags,soffice_bin, \
--Xlinker -platform_version -Xlinker macos -Xlinker 
$(MAC_OS_X_VERSION_MIN_REQUIRED_DOTS) \
--Xlinker 0.0.0 \
-))
-endif
-
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Executable_set_targettype_gui,soffice_bin,NO))
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 521ff3e43683..864518c389e4 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17554,6 +17554,7 @@ vcl/inc/window.h
 vcl/inc/wizdlg.hxx
 vcl/ios/dummies.cxx
 vcl/ios/iosinst.cxx
+vcl/ios/salios.cxx
 vcl/null/printerinfomanager.cxx
 vcl/opengl/DeviceInfo.cxx
 vcl/opengl/FixedTextureAtlas.cxx
@@ -17623,7 +17624,9 @@ vcl/osx/documentfocuslistener.cxx
 vcl/osx/documentfocuslistener.hxx
 vcl/osx/saldata.cxx
 vcl/osx/salframe.cxx
+vcl/osx/salgdiutils.cxx
 vcl/osx/salinst.cxx
+vcl/osx/salmacos.cxx
 vcl/osx/salmenu.cxx
 vcl/osx/salnativewidgets.cxx
 vcl/osx/salobj.cxx
@@ -17656,7 +17659,6 @@ vcl/quartz/ctfonts.cxx
 vcl/quartz/salbmp.cxx
 vcl/quartz/salgdi.cxx
 vcl/quartz/salgdicommon.cxx
-vcl/quartz/salgdiutils.cxx
 vcl/quartz/salvd.cxx
 vcl/quartz/utils.cxx
 vcl/source/app/ITiledRenderable.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9afdac80ef86..15a083df19a6 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -671,6 +671,7 @@ $(eval $(call 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/ar/lc_alphaliststyle.png|binary
 icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png |binary
 icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png |binary
 icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png|binary
 icon-themes/elementary/cmd/ar/lc_numberingstart.png|binary
 icon-themes/elementary/cmd/ar/lc_outlinebullet.png |binary
 icon-themes/elementary/cmd/ar/lc_romanliststyle.png|binary
 icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png |binary
 icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg|2 +-
 icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg |2 +-
 icon-themes/elementary_svg/cmd/ar/lc_bulletsandnumberingdialog.svg |2 +-
 icon-themes/elementary_svg/cmd/ar/lc_insertneutralparagraph.svg|2 +-
 icon-themes/elementary_svg/cmd/ar/lc_numberingstart.svg|2 +-
 icon-themes/elementary_svg/cmd/ar/lc_outlinebullet.svg |2 +-
 icon-themes/elementary_svg/cmd/ar/lc_romanliststyle.svg|2 +-
 icon-themes/elementary_svg/cmd/ar/lc_romanlowliststyle.svg |2 +-
 16 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d744883fe2cc26b1a5cec5f431541192d0672cc5
Author: Rizal Muttaqin 
AuthorDate: Mon Jan 18 04:26:48 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Sun Jan 17 23:40:18 2021 +0100

elementary: tdf#70102 repir RTL bullet numbering icons

Change-Id: I16d7133cfdc75758ec9df34bdd6d0d6b174fb620
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109410
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/ar/lc_alphaliststyle.png 
b/icon-themes/elementary/cmd/ar/lc_alphaliststyle.png
index 82c6c8d0b20e..8be955e3c522 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_alphaliststyle.png and 
b/icon-themes/elementary/cmd/ar/lc_alphaliststyle.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png 
b/icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png
index 361b3ef8dbf6..c2a9fc6b3c26 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png and 
b/icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png 
b/icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png
index 42be3b61845a..46c79573ab6c 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png 
and b/icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png 
b/icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png
index 10589b304738..01c45c22f7f1 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png and 
b/icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_numberingstart.png 
b/icon-themes/elementary/cmd/ar/lc_numberingstart.png
index 000c1aa2634d..4a7319222046 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_numberingstart.png and 
b/icon-themes/elementary/cmd/ar/lc_numberingstart.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_outlinebullet.png 
b/icon-themes/elementary/cmd/ar/lc_outlinebullet.png
index 1658ce8f871f..d6b2eb4d5d88 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_outlinebullet.png and 
b/icon-themes/elementary/cmd/ar/lc_outlinebullet.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_romanliststyle.png 
b/icon-themes/elementary/cmd/ar/lc_romanliststyle.png
index d50799621fbf..59b9d5f2b550 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_romanliststyle.png and 
b/icon-themes/elementary/cmd/ar/lc_romanliststyle.png differ
diff --git a/icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png 
b/icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png
index 810a02e2ff5d..8aa7c94af5a9 100644
Binary files a/icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png and 
b/icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png differ
diff --git a/icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg 
b/icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg
index 07ba1894a792..04c97f192ae3 100644
--- a/icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg
+++ b/icon-themes/elementary_svg/cmd/ar/lc_alphaliststyle.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg 
b/icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg
index 977cfa20a024..8c59fac6bb3c 100644
--- a/icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg
+++ b/icon-themes/elementary_svg/cmd/ar/lc_alphalowliststyle.svg
@@ -1 +1 @@
-

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |   31 ++
 sw/qa/uitest/writer_tests7/tdf132597.py |   44 
 2 files changed, 31 insertions(+), 44 deletions(-)

New commits:
commit 6bdfee076d7aea02f5ac3ea180d384974ed1ae58
Author: Xisco Fauli 
AuthorDate: Sun Jan 17 21:50:33 2021 +0100
Commit: Xisco Fauli 
CommitDate: Sun Jan 17 23:26:14 2021 +0100

tdf#132597: sw: Move UItest to CppUnitTest

Change-Id: I0409e22571fa2bb6a9fbf3eb7f6e81b544886aa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109488
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/uitest/data/tdf132597.odt 
b/sw/qa/extras/uiwriter/data3/tdf132597.odt
similarity index 100%
rename from sw/qa/uitest/data/tdf132597.odt
rename to sw/qa/extras/uiwriter/data3/tdf132597.odt
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index e781d266..6ba92153fb7d 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -375,6 +375,37 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135056)
 CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pWrtShell->GetTOXCount());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132597)
+{
+load(DATA_DIRECTORY, "tdf132597.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Copy();
+
+// Paste special as RTF
+uno::Sequence aPropertyValues = 
comphelper::InitPropertySequence(
+{ { "SelectedFormat", 
uno::makeAny(static_cast(SotClipboardFormatId::RTF)) } });
+
+dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126626)
 {
 load(DATA_DIRECTORY, "tdf126626.docx");
diff --git a/sw/qa/uitest/writer_tests7/tdf132597.py 
b/sw/qa/uitest/writer_tests7/tdf132597.py
deleted file mode 100644
index 1666ecbfc21e..
--- a/sw/qa/uitest/writer_tests7/tdf132597.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-from uitest.framework import UITestCase
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
-
-class tdf132597(UITestCase):
-
-def test_tdf132597(self):
-writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf132597.odt"))
-
-document = self.ui_test.get_component()
-self.assertEqual(1, document.CurrentController.PageCount)
-
-self.xUITest.executeCommand(".uno:SelectAll")
-self.xUITest.executeCommand(".uno:Copy")
-self.ui_test.execute_dialog_through_command(".uno:PasteSpecial")
-xDialog = self.xUITest.getTopFocusWindow()
-
-xList = xDialog.getChild('list')
-
-for childName in xList.getChildren():
-xChild = xList.getChild(childName)
-if get_state_as_dict(xChild)['Text'] == "Rich text formatting 
(RTF)":
-break
-
-xChild.executeAction("SELECT", tuple())
-self.assertEqual(get_state_as_dict(xList)['SelectEntryText'], "Rich 
text formatting (RTF)")
-
-xOkBtn = xDialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xOkBtn)
-
-self.xUITest.executeCommand(".uno:Undo")
-# Without the fix in place, it would have crashed here
-
-self.assertEqual(1, document.CurrentController.PageCount)
-
-self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/inc

[Tor Lillqvist (via logerrit)]

 vcl/inc/quartz/CGHelpers.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c70e427cefd2a257f624f0fbb9bc343f3eb89bcc
Author: Tor Lillqvist 
AuthorDate: Mon Jan 4 13:12:11 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Sun Jan 17 23:22:07 2021 +0100

CGLayerHolder::getScale() can be const

(Upcoming bugfix will require that.)

Change-Id: I727b2b5f1035ae70d62d3c5339a814161e3ec92a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108663
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109491
Tested-by: Jenkins CollaboraOffice 

diff --git a/vcl/inc/quartz/CGHelpers.hxx b/vcl/inc/quartz/CGHelpers.hxx
index cbd9a5e785f4..c83477ead4fe 100644
--- a/vcl/inc/quartz/CGHelpers.hxx
+++ b/vcl/inc/quartz/CGHelpers.hxx
@@ -68,7 +68,7 @@ public:
 
 void set(CGLayerRef const& pLayer) { mpLayer = pLayer; }
 
-float getScale() { return mfScale; }
+float getScale() const { return mfScale; }
 
 void setScale(float fScale) { mfScale = fScale; }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/avmedia/res/avaudiologo.png  |binary
 icon-themes/elementary/res/da06.png |binary
 icon-themes/elementary/res/impress128.png   |binary
 icon-themes/elementary/res/lx03123.png  |binary
 icon-themes/elementary/res/lx03130.png  |binary
 icon-themes/elementary/res/lx03249.png  |binary
 icon-themes/elementary/res/odp_16_8.png |binary
 icon-themes/elementary/res/odp_32_8.png |binary
 icon-themes/elementary/res/odp_48_8.png |binary
 icon-themes/elementary/res/otp_16_8.png |binary
 icon-themes/elementary/res/otp_32_8.png |binary
 icon-themes/elementary/res/otp_48_8.png |binary
 icon-themes/elementary/res/sx03123.png  |binary
 icon-themes/elementary/res/sx03130.png  |binary
 icon-themes/elementary/sd/cmd/transition-box.png|binary
 icon-themes/elementary/sd/cmd/transition-checkerboard.png   |binary
 icon-themes/elementary/sd/cmd/transition-comb.png   |binary
 icon-themes/elementary/sd/cmd/transition-cover.png  |binary
 icon-themes/elementary/sd/cmd/transition-cube-turning.png   |binary
 icon-themes/elementary/sd/cmd/transition-cut.png|binary
 icon-themes/elementary/sd/cmd/transition-diagonal-squares.png   |binary
 icon-themes/elementary/sd/cmd/transition-dissolve.png   |binary
 icon-themes/elementary/sd/cmd/transition-fade.png   |binary
 icon-themes/elementary/sd/cmd/transition-fall.png   |binary
 icon-themes/elementary/sd/cmd/transition-finedissolve.png   |binary
 icon-themes/elementary/sd/cmd/transition-glitter.png|binary
 icon-themes/elementary/sd/cmd/transition-honeycomb.png  |binary
 icon-themes/elementary/sd/cmd/transition-iris.png   |binary
 icon-themes/elementary/sd/cmd/transition-newsflash.png  |binary
 icon-themes/elementary/sd/cmd/transition-push.png   |binary
 icon-themes/elementary/sd/cmd/transition-random-bars.png|binary
 icon-themes/elementary/sd/cmd/transition-random.png |binary
 icon-themes/elementary/sd/cmd/transition-revolving-circles.png  |binary
 icon-themes/elementary/sd/cmd/transition-ripple.png |binary
 icon-themes/elementary/sd/cmd/transition-rochade.png|binary
 icon-themes/elementary/sd/cmd/transition-shape.png  |binary
 icon-themes/elementary/sd/cmd/transition-split.png  |binary
 icon-themes/elementary/sd/cmd/transition-static.png |binary
 icon-themes/elementary/sd/cmd/transition-tile-flip.png  |binary
 icon-themes/elementary/sd/cmd/transition-turn-around.png|binary
 icon-themes/elementary/sd/cmd/transition-turn-down.png  |binary
 icon-themes/elementary/sd/cmd/transition-turning-helix.png  |binary
 icon-themes/elementary/sd/cmd/transition-uncover.png|binary
 icon-themes/elementary/sd/cmd/transition-venetian-blinds-3d.png |binary
 icon-themes/elementary/sd/cmd/transition-venetian-blinds.png|binary
 icon-themes/elementary/sd/cmd/transition-vortex.png |binary
 icon-themes/elementary/sd/cmd/transition-wedge.png  |binary
 icon-themes/elementary/sd/cmd/transition-wheel.png  |binary
 icon-themes/elementary/sd/cmd/transition-wipe.png   |binary
 icon-themes/elementary/sfx2/res/128x128_impress_doc-p.png   |binary
 icon-themes/elementary/svx/res/3dgeo.png|binary
 icon-themes/elementary_svg/avmedia/res/avaudiologo.svg  |2 +-
 icon-themes/elementary_svg/res/da06.svg |2 +-
 icon-themes/elementary_svg/res/impress128.svg   |2 +-
 icon-themes/elementary_svg/res/lx03123.svg  |2 +-
 icon-themes/elementary_svg/res/lx03130.svg  |2 +-
 icon-themes/elementary_svg/res/lx03249.svg  |2 +-
 icon-themes/elementary_svg/res/odp_16_8.svg |2 +-
 icon-themes/elementary_svg/res/odp_32_8.svg |2 +-
 icon-themes/elementary_svg/res/odp_48_8.svg |2 +-
 icon-themes/elementary_svg/res/otp_16_8.svg |2 +-
 icon-themes/elementary_svg/res/otp_32_8.svg |2 +-
 icon-themes/elementary_svg/res/otp_48_8.svg |2 +-
 icon-themes/elementary_svg/res/sx03123.svg  |2 +-
 icon-themes/elementary_svg/res/sx03130.svg  

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a152699776ecedaa874cf9dc274c5825579880a2
Author: Xisco Fauli 
AuthorDate: Sun Jan 17 21:29:27 2021 +0100
Commit: Xisco Fauli 
CommitDate: Sun Jan 17 22:47:52 2021 +0100

sw_uiwriter3: remove redundant call to clear

See https://gerrit.libreoffice.org/c/core/+/109458
Kudos to Mike Kaganski for pointing this out

Change-Id: I1daa919ffcdc8b7a382ebf04470d957500dcfad9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109483
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 75df4291e78f..e781d266 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1506,7 +1506,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134626)
 TransferableDataHelper aHelper(xTransfer.get());
 
 mxComponent->dispose();
-mxComponent.clear();
 
 // Create a new document
 mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkdata.cxx|   47 +---
 vcl/unx/gtk3/gtk3gtkinst.cxx|1 
 vcl/unx/gtk3/gtk3gtksalmenu.cxx |   20 +
 3 files changed, 37 insertions(+), 31 deletions(-)

New commits:
commit ced00aadcffd00e5cd0acc00670cb52b2f733388
Author: Caolán McNamara 
AuthorDate: Thu Sep 3 16:04:35 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 17 22:11:30 2021 +0100

set small button provider at screen instead of at each widget

and make the small close button in the menubar use that same provider

add a small-button pattern to match buttons in toolbars

on its own this commit doesn't change anything, but a follow up commit
depends on it

Change-Id: I13623519d6fa51d9bd474589fa00e2fcc0c1e599
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102013
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 09601f9470cb342ccfd8a513e4a2460adf047b63)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109381
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 3182d1551f36..dce8a5b29ed3 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -506,22 +506,45 @@ void GtkSalData::Init()
 GtkSalDisplay *pDisplay = new GtkSalDisplay( pGdkDisp );
 SetDisplay( pDisplay );
 
-//FIXME: unwind keyboard extension bits
-
-// add signal handler to notify screen size changes
 int nScreens = gdk_display_get_n_screens( pGdkDisp );
 for( int n = 0; n < nScreens; n++ )
 {
 GdkScreen *pScreen = gdk_display_get_screen( pGdkDisp, n );
-if( pScreen )
-{
-pDisplay->screenSizeChanged( pScreen );
-pDisplay->monitorsChanged( pScreen );
-g_signal_connect( G_OBJECT(pScreen), "size-changed",
-  G_CALLBACK(signalScreenSizeChanged), pDisplay );
-g_signal_connect( G_OBJECT(pScreen), "monitors-changed",
-  G_CALLBACK(signalMonitorsChanged), 
GetGtkDisplay() );
-}
+if (!pScreen)
+continue;
+
+pDisplay->screenSizeChanged( pScreen );
+pDisplay->monitorsChanged( pScreen );
+// add signal handler to notify screen size changes
+g_signal_connect( G_OBJECT(pScreen), "size-changed",
+  G_CALLBACK(signalScreenSizeChanged), pDisplay );
+g_signal_connect( G_OBJECT(pScreen), "monitors-changed",
+  G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() );
+
+/*
+   set a provider to allow certain buttons to have no padding
+
+   a) little close button in menubar to close back to start-center
+   b) small buttons in view->data sources
+   c) small toolbar button in infobars
+*/
+GtkCssProvider* pSmallButtonProvider = gtk_css_provider_new();
+static const gchar data[] = "button.small-button, toolbar.small-button 
button { "
+  "padding: 0;"
+  "margin-left: 0px;"
+  "margin-right: 0px;"
+  "min-height: 18px;"
+  "min-width: 18px;"
+  "}";
+static const gchar olddata[] = "button.small-button, 
toolbar.small-button button { "
+  "padding: 0;"
+  "margin-left: 0px;"
+  "margin-right: 0px;"
+  "}";
+gtk_css_provider_load_from_data(pSmallButtonProvider, 
gtk_check_version(3, 20, 0) == nullptr ? data : olddata, -1, nullptr);
+
+gtk_style_context_add_provider_for_screen(pScreen, 
GTK_STYLE_PROVIDER(pSmallButtonProvider),
+GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 }
 
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b8629d49cbd6..cefec3415d62 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7902,7 +7902,6 @@ private:
 gtk_style_context_add_provider(pButtonContext,

GTK_STYLE_PROVIDER(m_pMenuButtonProvider),

GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-gtk_style_context_add_class(pButtonContext, "small-button");
 }
 
 }
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 6e47e4eae91a..ad188adfbc4f 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -659,6 +659,8 @@ void GtkSalMenu::ShowCloseButton(bool bShow)
 
 MenuBar *pVclMenuBar = static_cast(mpVCLMenu.get());
 mpCloseButton = gtk_button_new();
+gtk_widget_set_margin_start(mpCloseButton, 8);
+gtk_widget_set_margin_end(mpCloseButton, 8);
 g_signal_connect(mpCloseButton, "clicked", G_CALLBACK(CloseMenuBar), 
pVclMenuBar);
 
 gtk_button_set_relief(GTK_BUTTON(mpCloseButton), GTK_RELIEF_NONE);
@@ -667,24 +669,6 @@ void GtkSalMenu::S

[ABANDONED] Re: About upgrading towards Postgresql 13.1

[julien2412]

I began with https://gerrit.libreoffice.org/c/core/+/109456 but it even fails
on Linux with:
ar crs libpgport.a fls.o getpeereid.o strlcat.o strlcpy.o pg_crc32c_sse42.o
pg_crc32c_sb8.o pg_crc32c_sse42_choose.o chklocale.o erand48.o
inet_net_ntop.o noblock.o path.o pg_bitutils.o pg_strong_random.o
pgcheckdir.o pgmkdirp.o pgsleep.o pgstrcasecmp.o pgstrsignal.o pqsignal.o
qsort.o qsort_arg.o quotes.o snprintf.o sprompt.o strerror.o tar.o thread.o
clang -Wall -Wmissing-prototypes -Wpointer-arith
-Wdeclaration-after-statement -Werror=vla -Wendif-labels
-Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv
-Wno-unused-command-line-argument -O2 -fPIC -I../../src/port -DFRONTEND
-I../../src/include
-I/home/julien/lo/libreoffice/workdir/UnpackedTarball/icu/source/i18n
-I/home/julien/lo/libreoffice/workdir/UnpackedTarball/icu/source/common
-I/home/julien/lo/libreoffice/workdir/UnpackedTarball/openssl/include
-I/home/julien/lo/libreoffice/workdir/UnpackedTarball/openldap/include
-D_GNU_SOURCE  -c path.c -o path_shlib.o
rm -f libpgport_shlib.a
ar crs libpgport_shlib.a fls_shlib.o getpeereid_shlib.o strlcat_shlib.o
strlcpy_shlib.o pg_crc32c_sse42_shlib.o pg_crc32c_sb8_shlib.o
pg_crc32c_sse42_choose_shlib.o chklocale_shlib.o erand48_shlib.o
inet_net_ntop_shlib.o noblock_shlib.o path_shlib.o pg_bitutils_shlib.o
pg_strong_random_shlib.o pgcheckdir_shlib.o pgmkdirp_shlib.o pgsleep_shlib.o
pgstrcasecmp_shlib.o pgstrsignal_shlib.o pqsignal_shlib.o qsort_shlib.o
qsort_arg_shlib.o quotes_shlib.o snprintf_shlib.o sprompt_shlib.o
strerror_shlib.o tar_shlib.o thread_shlib.o
clang -Wall -Wmissing-prototypes -Wpointer-arith
-Wdeclaration-after-statement -Werror=vla -Wendif-labels
-Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv
-Wno-unused-command-line-argument -O2  -I../../src/port  -I../../src/include
-I/home/julien/lo/libreoffice/workdir/UnpackedTarball/icu/source/i18n
-I/home/julien/lo/libreoffice/workdir/UnpackedTarball/icu/source/common
-I/home/julien/lo/libreoffice/workdir/UnpackedTarball/openssl/include
-I/home/julien/lo/libreoffice/workdir/UnpackedTarball/openldap/include
-D_GNU_SOURCE  -c chklocale.c -o chklocale_srv.o
In file included from chklocale.c:17:
In file included from ../../src/include/postgres.h:47:
../../src/include/utils/elog.h:71:10: fatal error: 'utils/errcodes.h' file
not found
#include "utils/errcodes.h"
 ^~
1 error generated.

after comparing 9 and 13 versions to try to understand why it failed on
Linux, but didn't find.

If the very first pb is so difficult and considering there were still Mac
and Win builds to fix, thought it would be useless to keep on, I gave up.

Remark: I could build Postgresql source from
git.postgresql.org/git/postgresql.git just with usual configure and make. So
no libs lacking here.

(just wonder why it doesn't build out-of-the box or minimum/generic
instructions)



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

[Libreoffice-commits] core.git: vcl/Library_vcl.mk

[Tor Lillqvist (via logerrit)]

 vcl/Library_vcl.mk |   18 ++
 1 file changed, 6 insertions(+), 12 deletions(-)

New commits:
commit 1e877f46c6ce601692e8e229e7c856cd737866c3
Author: Tor Lillqvist 
AuthorDate: Sun Jan 17 22:06:22 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Sun Jan 17 21:41:04 2021 +0100

Expand vcl_quartz_code and vcl_coretext_code macros that were used only once

The macOS-specific code is nowadays compiled in Library_vclplug_osx.mk
so these macros that listed files compiled both for iOS and macOS were
used only for iOS in this makefile anyway.

Change-Id: I607ce0bd8834b81caff664f28419e50e87af87f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109484
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 51b45594f97f..9bb7906eb39f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -500,16 +500,6 @@ $(eval $(call gb_Library_add_cobjects,vcl,\
 vcl/source/filter/jpeg/transupp \
 ))
 
-vcl_quartz_code= \
-vcl/quartz/salbmp \
-vcl/quartz/utils \
-vcl/quartz/salgdicommon \
-vcl/quartz/salvd \
-
-vcl_coretext_code= \
-vcl/quartz/ctfonts \
-vcl/quartz/salgdi \
-
 vcl_headless_code= \
 vcl/headless/svpframe \
 $(if $(filter-out iOS,$(OS)), \
@@ -689,8 +679,12 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/ios/iOSTransferable \
 vcl/ios/DataFlavorMapping \
 vcl/ios/HtmlFmtFlt \
-$(vcl_coretext_code) \
-$(vcl_quartz_code) \
+vcl/quartz/ctfonts \
+vcl/quartz/salbmp \
+vcl/quartz/salgdi \
+vcl/quartz/salgdicommon \
+vcl/quartz/salvd \
+vcl/quartz/utils \
 $(vcl_headless_code) \
 ))
 $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format vcl/inc vcl/ios vcl/Library_vcl.mk vcl/Library_vclplug_osx.mk vcl/osx vcl/quartz

[Tor Lillqvist (via logerrit)]

 solenv/clang-format/excludelist |4 
 vcl/Library_vcl.mk  |1 
 vcl/Library_vclplug_osx.mk  |3 
 vcl/inc/quartz/salgdi.h |   14 -
 vcl/ios/salios.cxx  |  443 
 vcl/osx/salmacos.cxx|  387 ++
 vcl/quartz/salbmp.cxx   |   58 -
 vcl/quartz/salgdicommon.cxx |  181 
 vcl/quartz/salvd.cxx|  104 -
 9 files changed, 843 insertions(+), 352 deletions(-)

New commits:
commit e7ace1d043cc8bdf6c03097932a00cbbdc3cf557
Author: Tor Lillqvist 
AuthorDate: Sun Jan 17 21:29:10 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Sun Jan 17 21:40:07 2021 +0100

tdf#138122: Fix vcl for iOS after 1a167625314bf36b735176ed488e6ba9b5e9b675

Make vcl compile again for iOS and make the Collabora Office iOS app
work again when built against a master build of core.

For now, keep the old versions of the functions touched by
1a167625314bf36b735176ed488e6ba9b5e9b675 in vcl/ios/salios.cxx, and
move the modified versions to the new file vcl/osx/salmacos.cxx.

Keep the functions as they were except that ifdefs for MACOSX or IOS
are expanded. Keep the formatting as it was to make comparisons
easier. Thus add the new files to the clang-format exclusion list.

While at it, also move vcl/quartz/salgdiutils.cxx to vcl/osx as it is
compiled only for macOS anyway.

Change-Id: I990ef678f2263031d4a5af8cc547fffe185d17c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109480
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 99a3d5089d75..bef00255118e 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14779,6 +14779,7 @@ vcl/inc/window.h
 vcl/inc/wizdlg.hxx
 vcl/ios/dummies.cxx
 vcl/ios/iosinst.cxx
+vcl/ios/salios.cxx
 vcl/null/printerinfomanager.cxx
 vcl/osx/DataFlavorMapping.cxx
 vcl/osx/DataFlavorMapping.hxx
@@ -14804,7 +14805,9 @@ vcl/osx/documentfocuslistener.cxx
 vcl/osx/documentfocuslistener.hxx
 vcl/osx/saldata.cxx
 vcl/osx/salframe.cxx
+vcl/osx/salgdiutils.cxx
 vcl/osx/salinst.cxx
+vcl/osx/salmacos.cxx
 vcl/osx/salmenu.cxx
 vcl/osx/salnativewidgets.cxx
 vcl/osx/salobj.cxx
@@ -14830,7 +14833,6 @@ vcl/quartz/ctfonts.cxx
 vcl/quartz/salbmp.cxx
 vcl/quartz/salgdi.cxx
 vcl/quartz/salgdicommon.cxx
-vcl/quartz/salgdiutils.cxx
 vcl/quartz/salvd.cxx
 vcl/quartz/utils.cxx
 vcl/source/app/IconThemeInfo.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index d937fceb0a69..51b45594f97f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -685,6 +685,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/ios/iosinst \
 vcl/ios/dummies \
 vcl/ios/clipboard \
+vcl/ios/salios \
 vcl/ios/iOSTransferable \
 vcl/ios/DataFlavorMapping \
 vcl/ios/HtmlFmtFlt \
diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk
index f0d22298a0c8..9b82bd44c2a6 100644
--- a/vcl/Library_vclplug_osx.mk
+++ b/vcl/Library_vclplug_osx.mk
@@ -120,7 +120,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_osx,\
 vcl/osx/documentfocuslistener \
 vcl/osx/saldata \
 vcl/osx/salframe \
+vcl/osx/salgdiutils \
 vcl/osx/salinst \
+vcl/osx/salmacos \
 vcl/osx/salmenu \
 vcl/osx/salnativewidgets \
 vcl/osx/salobj \
@@ -132,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_osx,\
 vcl/quartz/salbmp \
 vcl/quartz/salgdi \
 vcl/quartz/salgdicommon \
-vcl/quartz/salgdiutils \
 vcl/quartz/salvd \
 vcl/quartz/utils \
 ))
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index eb3e7563c898..69b735787bdc 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -190,16 +190,16 @@ public:
 boolIsPenVisible() const{ return 
maLineColor.IsVisible(); }
 boolIsBrushVisible() const  { return 
maFillColor.IsVisible(); }
 
-float   GetWindowScaling();
-voidSetWindowGraphics( AquaSalFrame* pFrame );
-voidSetPrinterGraphics(CGContextRef, sal_Int32 
nRealDPIX, sal_Int32 nRealDPIY);
 voidSetVirDevGraphics(CGLayerHolder const &rLayer, 
CGContextRef, int nBitDepth = 0);
 #ifdef MACOSX
 voidinitResolution( NSWindow* );
 voidcopyResolution( AquaSalGraphics& );
 voidupdateResolution();
 
+float   GetWindowScaling();
+voidSetWindowGraphics( AquaSalFrame* pFrame );
 boolIsWindowGraphics()  const   { return mbWindow; 
}
+voidSetPrinterGraphics(CGContextRef, sal_Int32 
nRealDPIX, sal_Int32 nRealDPIY);
 AquaSalFrame*   getGraphicsFrame() const { return mpFra

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svtools svtools/source

[Caolán McNamara (via logerrit)]

 include/svtools/brwbox.hxx  |1 +
 include/svtools/editbrowsebox.hxx   |2 ++
 svtools/source/brwbox/brwbox2.cxx   |3 +++
 svtools/source/brwbox/ebbcontrols.cxx   |7 +++
 svtools/source/brwbox/editbrowsebox.cxx |8 ++--
 5 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 51c7c4ddb884703907759918f0541f9ad1f1fd98
Author: Caolán McNamara 
AuthorDate: Fri Jan 15 14:00:50 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 17 21:39:40 2021 +0100

tdf#135641 update DataBrowser has-focus when child widget gains focus

Change-Id: Ic5e618b50c31ebeffa1b2cc59857582804874747
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109372
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 0b0d3af6fb2e..47deb3af6755 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -507,6 +507,7 @@ public:
 boolReserveControlArea(sal_uInt16 nWidth = USHRT_MAX);
 tools::Rectangle   GetControlArea() const;
 boolProcessKey( const KeyEvent& rEvt );
+virtual voidChildFocusIn();
 voidDispatch( sal_uInt16 nId );
 voidSetMode( BrowserMode nMode );
 BrowserMode GetMode( ) const { return m_nCurrentMode; }
diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index a1a38353637e..1b9fd13aa93f 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -326,6 +326,7 @@ namespace svt
 virtual bool ControlHasFocus() const = 0;
 protected:
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(FocusInHdl, weld::Widget&, void);
 };
 
 //= ComboBoxControl
@@ -691,6 +692,7 @@ namespace svt
 virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 
_nColumnPos,const Point& _rPoint) override;
 
 css::uno::Reference< css::accessibility::XAccessible > 
CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& 
eState);
+virtual void ChildFocusIn() override;
 bool ControlHasFocus() const;
 protected:
 // creates the accessible which wraps the active cell
diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index e9e725149020..8cd05f2daa7c 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1698,6 +1698,9 @@ bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
 return nId != BROWSER_NONE;
 }
 
+void BrowseBox::ChildFocusIn()
+{
+}
 
 void BrowseBox::Dispatch( sal_uInt16 nId )
 {
diff --git a/svtools/source/brwbox/ebbcontrols.cxx 
b/svtools/source/brwbox/ebbcontrols.cxx
index c38025d0a13e..e5e404bb291f 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -35,6 +35,7 @@ namespace svt
 m_xWidget->set_entry_width_chars(1); // so a smaller than default 
width can be used
 m_xWidget->connect_changed(LINK(this, ComboBoxControl, SelectHdl));
 m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
+m_xWidget->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
 }
 
 void ComboBoxControl::dispose()
@@ -116,6 +117,11 @@ namespace svt
 return 
static_cast(GetParent())->GetParent()->ProcessKey(rKEvt);
 }
 
+IMPL_LINK_NOARG(ControlBase, FocusInHdl, weld::Widget&, void)
+{
+return 
static_cast(GetParent())->GetParent()->ChildFocusIn();
+}
+
 //= ListBoxControl
 ListBoxControl::ListBoxControl(vcl::Window* pParent)
 : ControlBase(pParent, "svt/ui/listcontrol.ui", "ListControl")
@@ -124,6 +130,7 @@ namespace svt
 m_xWidget->set_size_request(42, -1); // so a later narrow size request 
can stick
 m_xWidget->connect_changed(LINK(this, ListBoxControl, SelectHdl));
 m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
+m_xWidget->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
 }
 
 void ListBoxControl::dispose()
diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index 12ef6d6fd181..83b44d07daf1 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -194,7 +194,7 @@ namespace svt
 if (IsEditing() && Controller()->GetWindow().IsVisible())
 Controller()->GetWindow().GrabFocus();
 
-DetermineFocus( getRealGetFocusFlags( this ) );
+DetermineFocus(getRealGetFocusFlags(this));
 }
 
 
@@ -415,6 +415,10 @@ namespace svt
 }
 }
 
+void EditBrowseBox::ChildFocusIn()
+{
+DetermineFocus(getRealGetFocusFlags(this));
+}
 
 void EditBrowseBox::MouseButtonDown(const BrowserMouseEvent& rEvt)
 {
@@ -677,7 +681,7 @@ namespace svt
 switch (rEvt.GetType())
 {
 case

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/svtools svtools/source

[Caolán McNamara (via logerrit)]

 include/svtools/brwbox.hxx  |1 +
 include/svtools/editbrowsebox.hxx   |3 +++
 svtools/source/brwbox/brwbox2.cxx   |3 +++
 svtools/source/brwbox/ebbcontrols.cxx   |   10 ++
 svtools/source/brwbox/editbrowsebox.cxx |8 ++--
 5 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 3812a2678c8aeba6ea980e3df5ee63792a217199
Author: Caolán McNamara 
AuthorDate: Fri Jan 15 14:00:50 2021 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 17 21:39:14 2021 +0100

tdf#135641 update DataBrowser has-focus when child widget gains focus

Change-Id: Ic5e618b50c31ebeffa1b2cc59857582804874747
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109349
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index a86fce72307f..b865b0957129 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -587,6 +587,7 @@ public:
 boolReserveControlArea(sal_uInt16 nWidth = USHRT_MAX);
 tools::Rectangle   GetControlArea() const;
 virtual boolProcessKey(const KeyEvent& rEvt);
+virtual voidChildFocusIn();
 voidDispatch( sal_uInt16 nId );
 voidSetMode( BrowserMode nMode );
 BrowserMode GetMode( ) const { return m_nCurrentMode; }
diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 4f212bf9de4d..46a35c203e96 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -173,6 +173,7 @@ namespace svt
 virtual bool ProcessKey(const KeyEvent& rKEvt);
 protected:
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(FocusInHdl, weld::Widget&, void);
 };
 
 class SVT_DLLPUBLIC EditControlBase : public ControlBase
@@ -981,6 +982,8 @@ namespace svt
 
 virtual bool ProcessKey(const KeyEvent& rEvt) override;
 
+virtual void ChildFocusIn() override;
+
 css::uno::Reference< css::accessibility::XAccessible > 
CreateAccessibleCheckBoxCell(sal_Int32 _nRow, sal_uInt16 _nColumnPos,const 
TriState& eState);
 bool ControlHasFocus() const;
 protected:
diff --git a/svtools/source/brwbox/brwbox2.cxx 
b/svtools/source/brwbox/brwbox2.cxx
index d2e9f4e04237..5424edfb0cf2 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1687,6 +1687,9 @@ bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
 return nId != BROWSER_NONE;
 }
 
+void BrowseBox::ChildFocusIn()
+{
+}
 
 void BrowseBox::Dispatch( sal_uInt16 nId )
 {
diff --git a/svtools/source/brwbox/ebbcontrols.cxx 
b/svtools/source/brwbox/ebbcontrols.cxx
index 6557552fc7d5..32c29784ce7b 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -31,6 +31,7 @@ namespace svt
 m_xWidget->set_entry_width_chars(1); // so a smaller than default 
width can be used
 m_xWidget->connect_changed(LINK(this, ComboBoxControl, SelectHdl));
 m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
+m_xWidget->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
 }
 
 void ComboBoxControl::dispose()
@@ -116,6 +117,7 @@ namespace svt
 m_xWidget->set_size_request(42, -1); // so a later narrow size request 
can stick
 m_xWidget->connect_changed(LINK(this, ListBoxControl, SelectHdl));
 m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
+m_xWidget->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
 }
 
 void ListBoxControl::dispose()
@@ -184,6 +186,7 @@ namespace svt
 m_aModeState.bTriStateEnabled = true;
 InitControlBase(m_xBox.get());
 m_xBox->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
+m_xBox->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
 m_xBox->connect_toggled(LINK(this, CheckBoxControl, OnToggle));
 }
 
@@ -335,6 +338,7 @@ namespace svt
 m_pEntry->show();
 m_pEntry->set_width_chars(1); // so a smaller than default width can 
be used
 m_pEntry->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
+m_pEntry->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
 }
 
 bool ControlBase::ProcessKey(const KeyEvent& rKEvt)
@@ -347,6 +351,11 @@ namespace svt
 return ProcessKey(rKEvt);
 }
 
+IMPL_LINK_NOARG(ControlBase, FocusInHdl, weld::Widget&, void)
+{
+return 
static_cast(GetParent())->GetParent()->ChildFocusIn();
+}
+
 void EditControlBase::dispose()
 {
 m_pEntry = nullptr;
@@ -609,6 +618,7 @@ namespace svt
 {
 InitControlBase(m_xWidget.get());
 m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
+m_xWidget->connect_focus_in(LINK(this, ControlBase, FocusInHdl));
 // so any the natural size doesn't have an effect
 m_xWidget

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

[Thorsten Wagner (via logerrit)]

 vcl/osx/salframe.cxx |   32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

New commits:
commit 058ad4b900b5e0ee902f3e89ed121c2b5f8c58f1
Author: Thorsten Wagner 
AuthorDate: Sun Jan 17 20:24:26 2021 +0100
Commit: Tor Lillqvist 
CommitDate: Sun Jan 17 21:38:12 2021 +0100

tdf#138314 Change selected tab text color on macOS Big Sur

Starting with macOS Big Sur, coloring has changed. Currently there is
no documentation which system color should be used for selected tab
text. As a workaround text color is changed for macOS Big Sur and
newer only.

Change-Id: I2e8c83527775c17f95e5e4afe70577442e14715e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109479
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index b4168a2142e7..9d4f68827a06 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1302,27 +1302,37 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 // black otherwise
 
 Color aControlTextColor(getColor([NSColor controlTextColor], COL_BLACK, 
mpNSWindow));
-Color aSelectedControlTextColor(getColor([NSColor 
alternateSelectedControlTextColor], COL_WHITE, mpNSWindow));
-aStyleSettings.SetDefaultButtonTextColor(aSelectedControlTextColor);
+Color aSelectedControlTextColor(getColor([NSColor 
selectedControlTextColor], COL_BLACK, mpNSWindow));
+Color aAlternateSelectedControlTextColor(getColor([NSColor 
alternateSelectedControlTextColor], COL_WHITE, mpNSWindow));
+
aStyleSettings.SetDefaultButtonTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetButtonTextColor(aControlTextColor);
-aStyleSettings.SetDefaultActionButtonTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetDefaultActionButtonTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetActionButtonTextColor(aControlTextColor);
 aStyleSettings.SetFlatButtonTextColor(aControlTextColor);
-
aStyleSettings.SetDefaultButtonRolloverTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetDefaultButtonRolloverTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetButtonRolloverTextColor(aControlTextColor);
-
aStyleSettings.SetDefaultActionButtonRolloverTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetDefaultActionButtonRolloverTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetActionButtonRolloverTextColor(aControlTextColor);
 aStyleSettings.SetFlatButtonRolloverTextColor(aControlTextColor);
-
aStyleSettings.SetDefaultButtonPressedRolloverTextColor(aSelectedControlTextColor);
-
aStyleSettings.SetButtonPressedRolloverTextColor(aSelectedControlTextColor);
-
aStyleSettings.SetDefaultActionButtonPressedRolloverTextColor(aSelectedControlTextColor);
-
aStyleSettings.SetActionButtonPressedRolloverTextColor(aSelectedControlTextColor);
+
aStyleSettings.SetDefaultButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
+
aStyleSettings.SetButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
+
aStyleSettings.SetDefaultActionButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
+
aStyleSettings.SetActionButtonPressedRolloverTextColor(aAlternateSelectedControlTextColor);
 aStyleSettings.SetFlatButtonPressedRolloverTextColor(aControlTextColor);
 
-// Set text colors for tabs according to OS settings, typically white for 
selected buttons, black otherwise
+// Set text colors for tabs according to OS settings
 
 aStyleSettings.SetTabTextColor(aControlTextColor);
-aStyleSettings.SetTabHighlightTextColor(aSelectedControlTextColor);
+
+// FIXME: Starting with macOS Big Sur, coloring has changed. Currently 
there is no documentation which system color should be
+// used for selected tab text. As a workaround the current OS version has 
to be considered. This code has to be reviewed once
+// issue is covered by documentation.
+
+NSOperatingSystemVersion aOSVersion = { .majorVersion = 11, .minorVersion 
= 0, .patchVersion = 0 };
+if ([NSProcessInfo.processInfo isOperatingSystemAtLeastVersion: 
aOSVersion])
+aStyleSettings.SetTabHighlightTextColor(aSelectedControlTextColor);
+else
+
aStyleSettings.SetTabHighlightTextColor(aAlternateSelectedControlTextColor);
 
 aStyleSettings.SetCursorBlinkTime( mnBlinkCursorDelay );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/acceptalltrackedchanges.png  |binary
 icon-themes/elementary/cmd/32/accepttrackedchange.png  |binary
 icon-themes/elementary/cmd/32/accepttrackedchanges.png |binary
 icon-themes/elementary/cmd/32/accepttrackedchangetonext.png|binary
 icon-themes/elementary/cmd/32/ar/deleterecord.png  |binary
 icon-themes/elementary/cmd/32/ar/removebullets.png |binary
 icon-themes/elementary/cmd/32/bezierdelete.png |binary
 icon-themes/elementary/cmd/32/capturepoint.png |binary
 icon-themes/elementary/cmd/32/cleararrowdependents.png |binary
 icon-themes/elementary/cmd/32/cleararrowprecedents.png |binary
 icon-themes/elementary/cmd/32/cleararrows.png  |binary
 icon-themes/elementary/cmd/32/commentchangetracking.png|binary
 icon-themes/elementary/cmd/32/dbformdelete.png |binary
 icon-themes/elementary/cmd/32/dbquerydelete.png|binary
 icon-themes/elementary/cmd/32/dbreportdelete.png   |binary
 icon-themes/elementary/cmd/32/dbtabledelete.png|binary
 icon-themes/elementary/cmd/32/deleteallannotation.png  |binary
 icon-themes/elementary/cmd/32/deleteallbreaks.png  |binary
 icon-themes/elementary/cmd/32/deleteannotation.png |binary
 icon-themes/elementary/cmd/32/deleteauthor.png |binary
 icon-themes/elementary/cmd/32/deletecolumns.png|binary
 icon-themes/elementary/cmd/32/deletemasterpage.png |binary
 icon-themes/elementary/cmd/32/deletepage.png   |binary
 icon-themes/elementary/cmd/32/deletepivottable.png |binary
 icon-themes/elementary/cmd/32/deleteprintarea.png  |binary
 icon-themes/elementary/cmd/32/deleterecord.png |binary
 icon-themes/elementary/cmd/32/deleterows.png   |binary
 icon-themes/elementary/cmd/32/deleteslide.png  |binary
 icon-themes/elementary/cmd/32/deletetable.png  |binary
 icon-themes/elementary/cmd/32/formfilternavigator.png  |binary
 icon-themes/elementary/cmd/32/graphicfilterpopart.png  |binary
 icon-themes/elementary/cmd/32/graphicfilterremovenoise.png |binary
 icon-themes/elementary/cmd/32/helplinesuse.png |binary
 icon-themes/elementary/cmd/32/lc_deleterecord.png  |binary
 icon-themes/elementary/cmd/32/lc_graphicfilterremovenoise.png  |binary
 icon-themes/elementary/cmd/32/lc_removebullets.png |binary
 icon-themes/elementary/cmd/32/macrorecorder.png|binary
 icon-themes/elementary/cmd/32/managebreakpoints.png|binary
 icon-themes/elementary/cmd/32/mediamute.png|binary
 icon-themes/elementary/cmd/32/navigator.png|binary
 icon-themes/elementary/cmd/32/nexttrackedchange.png|binary
 icon-themes/elementary/cmd/32/previoustrackedchange.png|binary
 icon-themes/elementary/cmd/32/redline_deleted.png  |binary
 icon-themes/elementary/cmd/32/rejectalltrackedchanges.png  |binary
 icon-themes/elementary/cmd/32/rejecttrackedchange.png  |binary
 icon-themes/elementary/cmd/32/rejecttrackedchangetonext.png|binary
 icon-themes/elementary/cmd/32/remove.png   |binary
 icon-themes/elementary/cmd/32/removebullets.png|binary
 icon-themes/elementary/cmd/32/removefiltersort.png |binary
 icon-themes/elementary/cmd/32/removehyperlink.png  |binary
 icon-themes/elementary/cmd/32/reportnavigator.png  |binary
 icon-themes/elementary/cmd/32/sc_graphicfilterremovenoise.png  |binary
 icon-themes/elementary/cmd/32/showfmexplorer.png   |binary
 icon-themes/elementary/cmd/32/showinvalid.png  |binary
 icon-themes/elementary/cmd/32/showtrackedchanges.png   |binary
 icon-themes/elementary/cmd/32/snapborder.png   |binary
 icon-themes/elementary/cmd/32/snapframe.png|binary
 icon-themes/elementary/cmd/32/snappoints.png   |binary
 icon-themes/elementary/cmd/32/togglebreakpoint.png |binary
 icon-themes/elementary/cmd/32/trackchanges.png |binary
 icon-themes/elementary/cmd/32/trackchangesbar.png  |binary
 icon-themes/elementary/cmd/ar/lc_deleterecord.png  |binary
 icon-themes/elementary/cmd/ar/lc_removebullets.png |binary
 icon-themes/elementary/cmd/ar/sc_deleterecord.png  |binary
 icon-themes/elementary/cmd/ar/sc_removebullets.png |binary
 icon-themes/elementary/cmd/lc_acceptalltrackedchanges.png 

[Libreoffice-commits] core.git: desktop/Executable_soffice_bin.mk vcl/inc vcl/osx vcl/quartz

[Thorsten Wagner (via logerrit)]

 desktop/Executable_soffice_bin.mk |   12 -
 vcl/inc/quartz/salgdi.h   |   16 +
 vcl/osx/salinst.cxx   |   15 +
 vcl/quartz/salbmp.cxx |   22 +-
 vcl/quartz/salgdi.cxx |8 
 vcl/quartz/salgdicommon.cxx   |  315 +++---
 vcl/quartz/salgdiutils.cxx|   41 
 vcl/quartz/salvd.cxx  |  124 +-
 8 files changed, 260 insertions(+), 293 deletions(-)

New commits:
commit 1a167625314bf36b735176ed488e6ba9b5e9b675
Author: Thorsten Wagner 
AuthorDate: Sun Jan 10 23:49:25 2021 +0100
Commit: Tor Lillqvist 
CommitDate: Sun Jan 17 19:21:15 2021 +0100

tdf#138122 Add window scaling for retina displays on macOS

(1) Remove hack to make application look as if being linked against SDK 
10.13

(2) Use quad storage size on virtual devices for displaying on retina 
displays thereafter

(3) Apply workaround to downsample bitmaps from scaled layers (to be 
implemented)

(4) Disable dark mode (to be implemented)

(5) Provide new environment variables:

VCL_MACOS_FORCE_WINDOW_SCALING:
window scaling on non retina displays

VCL_MACOS_FORCE_DARK_MODE:
enable dark mode (macOS 10.14, iOS 13 and newer)

VCL_MACOS_USE_SYSTEM_APPEARANCE:
use light mode or dark mode (macOS 10.14, iOS 13 and newer) as configured 
by system preferences

Change-Id: I99877cd62a98cb91bcbf27af62b043c31c5f5fc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109072
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/desktop/Executable_soffice_bin.mk 
b/desktop/Executable_soffice_bin.mk
index 5c895ed0e7cb..9c08a28361df 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -23,18 +23,6 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
 desktop/source/app/main \
 ))
 
-ifeq ($(OS),MACOSX)
-# At least when building against SDK 10.15, changing the LC_VERSION_MIN_MACOSX 
load command's sdk
-# value from 10.15 to "n/a" (i.e., 0.0.0) is necessary to avoid blurry text in 
the LO UI (see
-# 

-# "[driver][darwin] Pass -platform_version flag to the linker instead of the
-# -_version_min flag", 
clang/test/Driver/darwin-ld-platform-version-macos.c in particular,
-# for the -platform_version that Clang passes by default to new-enough ld):
-$(eval $(call gb_Executable_add_ldflags,soffice_bin, \
--Xlinker -platform_version -Xlinker macos -Xlinker 
$(MACOSX_DEPLOYMENT_TARGET) -Xlinker 0.0.0 \
-))
-endif
-
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Executable_set_targettype_gui,soffice_bin,NO))
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 6d7db6a6dd60..eb3e7563c898 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -174,6 +174,7 @@ class AquaSalGraphics : public SalGraphics
 #ifdef MACOSX
 /// is this a window graphics
 boolmbWindow;
+boolmbWindowScaling;
 
 #else // IOS
 
@@ -189,10 +190,10 @@ public:
 boolIsPenVisible() const{ return 
maLineColor.IsVisible(); }
 boolIsBrushVisible() const  { return 
maFillColor.IsVisible(); }
 
+float   GetWindowScaling();
 voidSetWindowGraphics( AquaSalFrame* pFrame );
-voidSetPrinterGraphics(
-CGContextRef, sal_Int32 nRealDPIX, sal_Int32 nRealDPIY );
-voidSetVirDevGraphics(CGLayerHolder const & rLayer, 
CGContextRef, int nBitDepth = 0);
+voidSetPrinterGraphics(CGContextRef, sal_Int32 
nRealDPIX, sal_Int32 nRealDPIY);
+voidSetVirDevGraphics(CGLayerHolder const &rLayer, 
CGContextRef, int nBitDepth = 0);
 #ifdef MACOSX
 voidinitResolution( NSWindow* );
 voidcopyResolution( AquaSalGraphics& );
@@ -299,9 +300,14 @@ public:
 virtual booldrawAlphaRect( tools::Long nX, tools::Long nY, 
tools::Long nWidth,
tools::Long nHeight, sal_uInt8 
nTransparency ) override;
 
+protected:
+virtual voidcopyScaledArea( tools::Long nDestX, tools::Long 
nDestY, tools::Long nSrcX, tools::Long nSrcY,
+tools::Long nSrcWidth, 
tools::Long nSrcHeight, SalGraphics* pSrcGraphics );
+
 // native widget rendering methods that require mirroring
+
 #ifdef MACOSX
-protected:
+
 virtual boolisNativeControlSupported( ControlType nType, 
ControlPart nPart ) override;
 
 virtual boolhitTestNativeControl( ControlType nType, 
ControlPart nPart, const tools::Rectangle& rControlRegion,
@@ -313,9 +319,9 @@ protected:
 const ImplControlValue& 
aValue, 

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

[Julien Nabet (via logerrit)]

 sfx2/source/view/classificationhelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5bd90f7f5852056342f1a81a1285b474d468eadd
Author: Julien Nabet 
AuthorDate: Sun Jan 17 15:38:27 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 17 18:13:03 2021 +0100

cppcheck: derefInvalidIteratorRedundantCheck (sfx2/classificationhelper)

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

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index 523fe75571bb..85e7f3d55dde 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -700,14 +700,14 @@ InfobarType SfxClassificationHelper::GetImpactLevelType()
 
 SfxClassificationCategory& rCategory = itCategory->second;
 auto it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + 
PROP_IMPACTSCALE());
-OUString aScale = it->second;
 if (it == rCategory.m_aLabels.end())
 return aRet;
+OUString aScale = it->second;
 
 it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + 
PROP_IMPACTLEVEL());
-OUString aLevel = it->second;
 if (it == rCategory.m_aLabels.end())
 return aRet;
+OUString aLevel = it->second;
 
 // The spec defines two valid scale values: FIPS-199 and UK-Cabinet.
 if (aScale == "UK-Cabinet")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 xmloff/source/text/txtimp.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 79e471dc116f0b662e48d915d395d398057d137f
Author: Julien Nabet 
AuthorDate: Sun Jan 17 15:31:08 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 17 16:32:47 2021 +0100

duplicate break (xmloff/txtimp)

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

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 9642eb83d6da..dc6612b113b1 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1767,7 +1767,6 @@ SvXMLImportContext 
*XMLTextImportHelper::CreateTextChildContext(
 pContext = new XMLNumberedParaContext(
 rImport, nElement, xAttrList );
 break;
-break;
 case XML_ELEMENT(TEXT, XML_LIST):
 pContext = new XMLTextListBlockContext( rImport, *this,
 xAttrList );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 wizards/source/sfdocuments/SF_Register.xba |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 25d905d7f88779eecf3776f692efe5539730fbef
Author: Andrea Gelmini 
AuthorDate: Wed Jan 13 19:00:53 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 17 16:32:28 2021 +0100

Fix typo

Change-Id: I0ce46927730cef961bbefd12551b2d56e8fe357d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109240
Tested-by: Jean-Pierre Ledure 
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/sfdocuments/SF_Register.xba 
b/wizards/source/sfdocuments/SF_Register.xba
index b83518d9491c..5ddb307ba7a0 100644
--- a/wizards/source/sfdocuments/SF_Register.xba
+++ b/wizards/source/sfdocuments/SF_Register.xba
@@ -267,7 +267,7 @@ Public Function _GetEventScriptCode(poObject As Object _
 ''' poObject: a com.sun.star.form.XForm or XControl 
object
 ''' psEvent: the "On..." name of the event
 ''' psName: the name of the object to be identified 
from the parent object
-''' Returne:
+''' Returns:
 ''' The script to trigger when psEvent occurs
 ''' See Scripting Framework URI Specification : 
https://wiki.openoffice.org/wiki/Documentation/DevGuide/Scripting/Scripting_Framework_URI_Specification
 
@@ -458,7 +458,7 @@ Public Function _RegisterEventScript(poObject As Object _
 ''' psScriptCode: The script to trigger when 
psEvent occurs
 ''' See Scripting Framework URI 
Specification : 
https://wiki.openoffice.org/wiki/Documentation/DevGuide/Scripting/Scripting_Framework_URI_Specification
 ''' psName: the name of the object to associate 
with the event
-''' Returne:
+''' Returns:
 ''' True when successful
 
 Dim oEvent As Object   '  
com.sun.star.script.ScriptEventDescriptor
@@ -509,4 +509,4 @@ Catch:
 End Function   '  SFDocuments.SF_Register._RegisterEventScript
 
 REM == END OF 
SFDOCUMENTS.SF_REGISTER
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 include/svx/ColorSets.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5bb291df3c39656cd24a7c379b8764172d48579a
Author: Noel Grandin 
AuthorDate: Sat Jan 16 19:28:46 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Jan 17 16:04:30 2021 +0100

use ::Color in ColorSet::add

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

diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index 8b4a035a1857..361fe47c622e 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -28,9 +28,9 @@ class ColorSet
 public:
 ColorSet(OUString const & aName);
 
-void add(sal_uInt32 nIndex, sal_uInt32 aColorData)
+void add(sal_uInt32 nIndex, ::Color aColorData)
 {
-maColors[nIndex] = Color(ColorTransparency, aColorData);
+maColors[nIndex] = aColorData;
 }
 
 const OUString& getName() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sc/source/ui/view/drawvie3.cxx |2 +-
 vcl/qa/cppunit/pdfexport/pdfexport.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9fb2cad5ba0dfc1c3617880c02f2e7b21384dd60
Author: Andrea Gelmini 
AuthorDate: Sun Jan 17 12:50:26 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 17 15:50:16 2021 +0100

Fix typos

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

diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 4e2928b0569d..e120811a4d23 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -178,7 +178,7 @@ void adjustAnchoredPosition(const SdrHint& rHint, const 
ScDocument& rDoc, SCTAB
 return;
 
 // SetCellAnchoredFromPosition has to be called only if shape geometry has 
been changed, and not
-// if only shape visibilty has been changed. It is not enough to test 
shape rect, because e.g. a
+// if only shape visibility has been changed. It is not enough to test 
shape rect, because e.g. a
 // 180deg rotation changes only the logic rect (tdf#139583).
 ScDrawObjData& rNoRotatedAnchor = *ScDrawLayer::GetNonRotatedObjData(pObj, 
true /*bCreate*/);
 if (lcl_AreRectanglesApproxEqual(pAnchor->getShapeRect(), 
pObj->GetSnapRect())
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 2b84591c3dca..f9d389777fbb 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -2613,7 +2613,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testPdfUaMetadata)
 auto& rStream = pStreamObject->GetMemory();
 rStream.Seek(0);
 
-// Search for the PDF/UA mrker in the metadata
+// Search for the PDF/UA marker in the metadata
 
 tools::XmlWalker aWalker;
 CPPUNIT_ASSERT(aWalker.open(&rStream));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42574d1c7b94d7914cf960c9b3c3bc47c2d79110
Author: Andrea Gelmini 
AuthorDate: Thu Jan 14 20:57:53 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 17 15:47:46 2021 +0100

Fix typo

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index e745fbf68f0e..af48682cfcd2 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -605,7 +605,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912)
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf39721)
 {
-// FIXME: disabled on Windows because of a not reproducable problem (not 
related to the patch)
+// FIXME: disabled on Windows because of a not reproducible problem (not 
related to the patch)
 #if !defined(_WIN32)
 // check move down with redlining
 load(DATA_DIRECTORY, "tdf39721.fodt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa

[Andrea Gelmini (via logerrit)]

 0 files changed

New commits:
commit e4f354cef543752f99b53bdf62d9bc4df67368be
Author: Andrea Gelmini 
AuthorDate: Sun Jan 17 12:22:41 2021 +0100
Commit: Andrea Gelmini 
CommitDate: Sun Jan 17 15:41:49 2021 +0100

Removed executable permission on ods file

Change-Id: Idabe9a8070c4a248b34e38ad58fcdd7a9e9afd72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109467
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/sc/qa/unit/data/ods/tdf139258_rotated_image.ods 
b/sc/qa/unit/data/ods/tdf139258_rotated_image.ods
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 drawinglayer/source/primitive2d/svggradientprimitive2d.cxx |4 ++--
 sw/source/uibase/docvw/FrameControlsManager.cxx|2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 95f2c4c6396c826b5cf94adcc848c0df4dc76030
Author: Julien Nabet 
AuthorDate: Sun Jan 17 13:16:04 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 17 15:16:12 2021 +0100

cppcheck: Prefer prefix ++/-- operators for non-primitive types

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

diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx 
b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 7c9eb8441306..116c2c6c03db 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -186,7 +186,7 @@ namespace drawinglayer::primitive2d
 const bool bMirror(SpreadMethod::Reflect == getSpreadMethod() && 0 
!= rInt % 2);
 const SvgGradientEntryVector& rCurrent(bMirror ? 
getMirroredGradientEntries() : getGradientEntries());
 
-for(SvgGradientEntryVector::const_reverse_iterator 
aIter(rCurrent.rbegin()); aIter != rCurrent.rend(); aIter++)
+for(SvgGradientEntryVector::const_reverse_iterator 
aIter(rCurrent.rbegin()); aIter != rCurrent.rend(); ++aIter)
 {
if(basegfx::fTools::lessOrEqual(aIter->getOffset(), fFrac))
{
@@ -208,7 +208,7 @@ namespace drawinglayer::primitive2d
 const bool bMirror(SpreadMethod::Reflect == getSpreadMethod() && 0 
!= rInt % 2);
 const SvgGradientEntryVector& rCurrent(bMirror ? 
getMirroredGradientEntries() : getGradientEntries());
 
-for(SvgGradientEntryVector::const_iterator 
aIter(rCurrent.begin()); aIter != rCurrent.end(); aIter++)
+for(SvgGradientEntryVector::const_iterator 
aIter(rCurrent.begin()); aIter != rCurrent.end(); ++aIter)
 {
if(basegfx::fTools::more(aIter->getOffset(), fFrac))
{
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx 
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 61bd5ca4badf..c9503e2a06d6 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -203,7 +203,7 @@ void 
SwFrameControlsManager::SetOutlineContentVisibilityButtons()
 it = m_aTextNodeContentFrameMap.erase(it);
 }
 else
-it++;
+++it;
 }
 for (SwNode* pNd : 
m_pEditWin->GetView().GetWrtShell().GetNodes().GetOutLineNds())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

[Julien Nabet (via logerrit)]

 sal/osl/unx/process.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad55d51486264260a135b36c85973a728e006de7
Author: Julien Nabet 
AuthorDate: Sun Jan 17 13:42:50 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 17 15:15:47 2021 +0100

cppcheck: zerodivcond

I don't know if it can happen or if it's a false positive
but at least, we're sure now it won't fail

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

diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 861324963dec..f75534fdc311 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -1067,7 +1067,7 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess 
Process, oslProcessData F
 unsigned long systemseconds;
 
 clktck = sysconf(_SC_CLK_TCK);
-if (clktck < 0) {
+if (clktck <= 0) {
 return osl_Process_E_Unknown;
 }
 hz = static_cast(clktck);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source

[Julien Nabet (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1d7be7863e7d2d5aa3c3008bb9ec04780d5eb95
Author: Julien Nabet 
AuthorDate: Sat Jan 16 14:32:42 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 17 14:07:18 2021 +0100

tdf#139643: fix missing PDF/UA flag

Regression from:

https://cgit.freedesktop.org/libreoffice/core/commit/vcl/source/gdi/pdfwriter_impl.cxx?id=a795886762a6a4aabd601183598c4e6c819bcb1f
author  Arnaud Versini  2019-09-20 19:01:34 
+0200
committer   Arnaud Versini  2020-02-08 
15:03:07 +0100
commit  a795886762a6a4aabd601183598c4e6c819bcb1f (patch)
tree93a58d738bf27a0c5f75f80dc7e651763916ee5f 
/vcl/source/gdi/pdfwriter_impl.cxx
parent  a2f62a861ba7036e689070c47f72214b1bdd49d4 (diff)
Add minimum support for PDF/A3

here:
 sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 {
-if (!m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_UA)
+if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 )

Change-Id: Id4b3b9a74ccf5a5abd9e7149cb09b3475dd4ffee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109399
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 11de3436e531..951cda0f29da 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5237,7 +5237,7 @@ static void lcl_assignMeta(const OUString& aValue, 
OString& aMeta)
 // emits the document metadata
 sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 {
-if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 )
+if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 && !m_bIsPDF_UA)
 return 0;
 
 //get the object number for all the destinations
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source

[Julien Nabet (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e819872ebc1f7f005cea3916561dae03c43f8552
Author: Julien Nabet 
AuthorDate: Sat Jan 16 14:32:42 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 17 14:06:45 2021 +0100

tdf#139643: fix missing PDF/UA flag

Regression from:

https://cgit.freedesktop.org/libreoffice/core/commit/vcl/source/gdi/pdfwriter_impl.cxx?id=a795886762a6a4aabd601183598c4e6c819bcb1f
author  Arnaud Versini  2019-09-20 19:01:34 
+0200
committer   Arnaud Versini  2020-02-08 
15:03:07 +0100
commit  a795886762a6a4aabd601183598c4e6c819bcb1f (patch)
tree93a58d738bf27a0c5f75f80dc7e651763916ee5f 
/vcl/source/gdi/pdfwriter_impl.cxx
parent  a2f62a861ba7036e689070c47f72214b1bdd49d4 (diff)
Add minimum support for PDF/A3

here:
 sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 {
-if (!m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_UA)
+if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 )

Change-Id: Id4b3b9a74ccf5a5abd9e7149cb09b3475dd4ffee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109400
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 7e02762d6e36..375a4fcba0d7 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5135,7 +5135,7 @@ static void lcl_assignMeta(const OUString& aValue, 
OString& aMeta)
 // emits the document metadata
 sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 {
-if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 )
+if( !m_bIsPDF_A1 && !m_bIsPDF_A2 && !m_bIsPDF_A3 && !m_bIsPDF_UA)
 return 0;
 
 //get the object number for all the destinations
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/avmedia/res/avaudiologo.png  |binary
 icon-themes/elementary/res/da06.png |binary
 icon-themes/elementary/res/impress128.png   |binary
 icon-themes/elementary/res/lx03123.png  |binary
 icon-themes/elementary/res/lx03130.png  |binary
 icon-themes/elementary/res/lx03249.png  |binary
 icon-themes/elementary/res/odp_16_8.png |binary
 icon-themes/elementary/res/odp_32_8.png |binary
 icon-themes/elementary/res/odp_48_8.png |binary
 icon-themes/elementary/res/otp_16_8.png |binary
 icon-themes/elementary/res/otp_32_8.png |binary
 icon-themes/elementary/res/otp_48_8.png |binary
 icon-themes/elementary/res/sx03123.png  |binary
 icon-themes/elementary/res/sx03130.png  |binary
 icon-themes/elementary/sd/cmd/transition-box.png|binary
 icon-themes/elementary/sd/cmd/transition-checkerboard.png   |binary
 icon-themes/elementary/sd/cmd/transition-comb.png   |binary
 icon-themes/elementary/sd/cmd/transition-cover.png  |binary
 icon-themes/elementary/sd/cmd/transition-cube-turning.png   |binary
 icon-themes/elementary/sd/cmd/transition-cut.png|binary
 icon-themes/elementary/sd/cmd/transition-diagonal-squares.png   |binary
 icon-themes/elementary/sd/cmd/transition-dissolve.png   |binary
 icon-themes/elementary/sd/cmd/transition-fade.png   |binary
 icon-themes/elementary/sd/cmd/transition-fall.png   |binary
 icon-themes/elementary/sd/cmd/transition-finedissolve.png   |binary
 icon-themes/elementary/sd/cmd/transition-glitter.png|binary
 icon-themes/elementary/sd/cmd/transition-honeycomb.png  |binary
 icon-themes/elementary/sd/cmd/transition-iris.png   |binary
 icon-themes/elementary/sd/cmd/transition-newsflash.png  |binary
 icon-themes/elementary/sd/cmd/transition-push.png   |binary
 icon-themes/elementary/sd/cmd/transition-random-bars.png|binary
 icon-themes/elementary/sd/cmd/transition-random.png |binary
 icon-themes/elementary/sd/cmd/transition-revolving-circles.png  |binary
 icon-themes/elementary/sd/cmd/transition-ripple.png |binary
 icon-themes/elementary/sd/cmd/transition-rochade.png|binary
 icon-themes/elementary/sd/cmd/transition-shape.png  |binary
 icon-themes/elementary/sd/cmd/transition-split.png  |binary
 icon-themes/elementary/sd/cmd/transition-static.png |binary
 icon-themes/elementary/sd/cmd/transition-tile-flip.png  |binary
 icon-themes/elementary/sd/cmd/transition-turn-around.png|binary
 icon-themes/elementary/sd/cmd/transition-turn-down.png  |binary
 icon-themes/elementary/sd/cmd/transition-turning-helix.png  |binary
 icon-themes/elementary/sd/cmd/transition-uncover.png|binary
 icon-themes/elementary/sd/cmd/transition-venetian-blinds-3d.png |binary
 icon-themes/elementary/sd/cmd/transition-venetian-blinds.png|binary
 icon-themes/elementary/sd/cmd/transition-vortex.png |binary
 icon-themes/elementary/sd/cmd/transition-wedge.png  |binary
 icon-themes/elementary/sd/cmd/transition-wheel.png  |binary
 icon-themes/elementary/sd/cmd/transition-wipe.png   |binary
 icon-themes/elementary/sfx2/res/128x128_impress_doc-p.png   |binary
 icon-themes/elementary/svx/res/3dgeo.png|binary
 icon-themes/elementary_svg/avmedia/res/avaudiologo.svg  |2 +-
 icon-themes/elementary_svg/res/da06.svg |2 +-
 icon-themes/elementary_svg/res/impress128.svg   |2 +-
 icon-themes/elementary_svg/res/lx03123.svg  |2 +-
 icon-themes/elementary_svg/res/lx03130.svg  |2 +-
 icon-themes/elementary_svg/res/lx03249.svg  |2 +-
 icon-themes/elementary_svg/res/odp_16_8.svg |2 +-
 icon-themes/elementary_svg/res/odp_32_8.svg |2 +-
 icon-themes/elementary_svg/res/odp_48_8.svg |2 +-
 icon-themes/elementary_svg/res/otp_16_8.svg |2 +-
 icon-themes/elementary_svg/res/otp_32_8.svg |2 +-
 icon-themes/elementary_svg/res/otp_48_8.svg |2 +-
 icon-themes/elementary_svg/res/sx03123.svg  |2 +-
 icon-themes/elementary_svg/res/sx03130.svg  

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/elementary/cmd/32/crookrotate.png |binary
 icon-themes/elementary/cmd/32/crookslant.png  |binary
 icon-themes/elementary/res/base128.png|binary
 icon-themes/elementary/res/lx03245.png|binary
 icon-themes/elementary/res/odb_16_8.png   |binary
 icon-themes/elementary/res/odb_32_8.png   |binary
 icon-themes/elementary/res/odb_48_8.png   |binary
 icon-themes/elementary/sw/res/envhc_l.png |binary
 icon-themes/elementary/sw/res/envhc_u.png |binary
 icon-themes/elementary/sw/res/envhl_l.png |binary
 icon-themes/elementary/sw/res/envhl_u.png |binary
 icon-themes/elementary/sw/res/envhr_l.png |binary
 icon-themes/elementary/sw/res/envhr_u.png |binary
 icon-themes/elementary/sw/res/envvc_l.png |binary
 icon-themes/elementary/sw/res/envvc_u.png |binary
 icon-themes/elementary/sw/res/envvl_l.png |binary
 icon-themes/elementary/sw/res/envvl_u.png |binary
 icon-themes/elementary/sw/res/envvr_l.png |binary
 icon-themes/elementary/sw/res/envvr_u.png |binary
 icon-themes/elementary_svg/cmd/32/crookrotate.svg |2 +-
 icon-themes/elementary_svg/cmd/32/crookslant.svg  |2 +-
 icon-themes/elementary_svg/res/base128.svg|2 +-
 icon-themes/elementary_svg/res/lx03245.svg|2 +-
 icon-themes/elementary_svg/res/odb_16_8.svg   |2 +-
 icon-themes/elementary_svg/res/odb_32_8.svg   |2 +-
 icon-themes/elementary_svg/res/odb_48_8.svg   |2 +-
 icon-themes/elementary_svg/sw/res/envhc_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhc_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhl_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhl_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhr_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envhr_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvc_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvc_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvl_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvl_u.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvr_l.svg |2 +-
 icon-themes/elementary_svg/sw/res/envvr_u.svg |2 +-
 38 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 9b4f8383961eda7afa6fbed051140dce892c2009
Author: Rizal Muttaqin 
AuthorDate: Sun Jan 17 15:16:11 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Sun Jan 17 14:02:06 2021 +0100

elementary: tdf#139056 update VIOLET color to follow upstream brand

Change-Id: Ieb2b680bc698dc533ec47d1a7b4fd47b8074911d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109406
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/crookrotate.png 
b/icon-themes/elementary/cmd/32/crookrotate.png
index 53c863c01cc4..dce4b259a6e8 100644
Binary files a/icon-themes/elementary/cmd/32/crookrotate.png and 
b/icon-themes/elementary/cmd/32/crookrotate.png differ
diff --git a/icon-themes/elementary/cmd/32/crookslant.png 
b/icon-themes/elementary/cmd/32/crookslant.png
index 9ed58b0471af..986da1345b86 100644
Binary files a/icon-themes/elementary/cmd/32/crookslant.png and 
b/icon-themes/elementary/cmd/32/crookslant.png differ
diff --git a/icon-themes/elementary/res/base128.png 
b/icon-themes/elementary/res/base128.png
index 9d984d71298b..d01e76e105d0 100644
Binary files a/icon-themes/elementary/res/base128.png and 
b/icon-themes/elementary/res/base128.png differ
diff --git a/icon-themes/elementary/res/lx03245.png 
b/icon-themes/elementary/res/lx03245.png
index 6c9a1126203c..ef762eec737a 100644
Binary files a/icon-themes/elementary/res/lx03245.png and 
b/icon-themes/elementary/res/lx03245.png differ
diff --git a/icon-themes/elementary/res/odb_16_8.png 
b/icon-themes/elementary/res/odb_16_8.png
index af1ce1a29079..d3d39cdda120 100644
Binary files a/icon-themes/elementary/res/odb_16_8.png and 
b/icon-themes/elementary/res/odb_16_8.png differ
diff --git a/icon-themes/elementary/res/odb_32_8.png 
b/icon-themes/elementary/res/odb_32_8.png
index d31b9d2f10db..31b7acbbb6fa 100644
Binary files a/icon-themes/elementary/res/odb_32_8.png and 
b/icon-themes/elementary/res/odb_32_8.png differ
diff --git a/icon-themes/elementary/res/odb_48_8.png 
b/icon-themes/elementary/res/odb_48_8.png
index e48d07ffb28f..36950a407a4f 100644
Binary files a/icon-themes/elementary/res/odb_48_8.png and 
b/icon-themes/elementary/res/odb_48_8.png differ
diff --git a/icon-themes/elementary/sw/res/envhc_l.png 
b/icon-themes/elementary/sw/res/envhc_l.png
index 0f3dcd587401..0c6c5c8bfe35 100644
Binary files a/icon-themes/elementary/sw/res/envhc_l.png and 
b/icon-themes/elementary/sw/res/envhc_l.png differ
diff --git a/icon-themes/elementary/sw/res/envhc_u.png 
b/icon-themes/elementary/sw/res/envhc_u.png
index b10e257b7c31..e414ce8c3d2d 100644
Binary files a/icon-themes/elementary/sw/res/envhc_u.png and 

[Libreoffice-commits] core.git: helpcontent2

[Andrea Gelmini (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56164821fb2deed9073db31c85d13a60fd08b0a4
Author: Andrea Gelmini 
AuthorDate: Sun Jan 17 13:02:17 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Jan 17 13:02:17 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to c5ca7b12b4d593f22db0d450a46335879b5ff2e2
  - Fix typo

Change-Id: I065d78e1451ac2b0b9458935727c72279b7155e6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109466
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 91413eacbe87..c5ca7b12b4d5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 91413eacbe8790505dfd4cc452b0fa2e5589ac33
+Subproject commit c5ca7b12b4d593f22db0d450a46335879b5ff2e2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Andrea Gelmini (via logerrit)]

 source/text/sbasic/shared/03/sf_ui.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c5ca7b12b4d593f22db0d450a46335879b5ff2e2
Author: Andrea Gelmini 
AuthorDate: Sun Jan 17 12:49:38 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 17 13:02:17 2021 +0100

Fix typo

Change-Id: I065d78e1451ac2b0b9458935727c72279b7155e6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109466
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/sbasic/shared/03/sf_ui.xhp 
b/source/text/sbasic/shared/03/sf_ui.xhp
index 06d2a0f3e..0f5b95787 100644
--- a/source/text/sbasic/shared/03/sf_ui.xhp
+++ b/source/text/sbasic/shared/03/sf_ui.xhp
@@ -199,7 +199,7 @@
   ui.CreateBaseDocument(FileName As String, 
[EmbeddedDatabase As String], [RegistrationName As String]) As 
Object


-   FileName : Identifies the file to 
create. It must follow the SF_FileSystem.FileNaming notation. If the file 
altready exists, it is overwritten without warning
+   FileName : Identifies the file to 
create. It must follow the SF_FileSystem.FileNaming notation. If the file 
already exists, it is overwritten without warning
EmbeddedDatabase : Either "HSQLDB" (default) or 
"FIREBIRD".
RegistrationName : The name used to store the new 
database in the databases register. When = "" (default), no registration takes 
place. If the name already exists it is overwritten without warning.

@@ -303,7 +303,7 @@
   ui.OpenBaseDocument([FileName As String], 
[RegistrationName As String], [MacroExecution As Integer]) As Object


-   FileName : Identifies the file to open. 
It must follow the SF_FileSystem.FileNaming notation. If the file altready 
exists, it is overwritten without warning
+   FileName : Identifies the file to open. 
It must follow the SF_FileSystem.FileNaming notation. If the file already 
exists, it is overwritten without warning
RegistrationName : The name to use to find the 
database in the databases register. It is ignored if 
FileName <> "".
MacroExecution: 0 = behaviour is defined by the 
user configuration, 1 = macros are not executable, 2 = macros are 
executable.

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 cui/source/dialogs/FontFeaturesDialog.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 648edf96cde392545749923dc0c748e0bb31b5f6
Author: Julien Nabet 
AuthorDate: Sun Jan 17 11:02:12 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 17 11:53:43 2021 +0100

Try to fix Windows TB

by using std::max and std::min

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

diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx 
b/cui/source/dialogs/FontFeaturesDialog.cxx
index 71c9e34d3e73..333cf1087f05 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -76,9 +76,10 @@ void FontFeaturesDialog::initialize()
 fillGrid(rFilteredFontFeatures);
 
 m_xContentWindow->set_size_request(
--1, std::min(std::max(m_xContentWindow->get_preferred_size().Height(),
-  m_xContentGrid->get_preferred_size().Height()),
- 300L));
+-1,
+
std::min(std::max(m_xContentWindow->get_preferred_size().Height(),
+
m_xContentGrid->get_preferred_size().Height()),
+  300));
 
 updateFontPreview();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/source

[Pranam Lashkari (via logerrit)]

 sd/source/ui/sidebar/SlideBackground.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 5515f469d32094299ec12bdd58880891ebcc9849
Author: Pranam Lashkari 
AuthorDate: Fri Nov 20 09:44:25 2020 +0530
Commit: Andras Timar 
CommitDate: Sun Jan 17 11:08:08 2021 +0100

hide background options in master slide view in sidebar

Change-Id: Idecf4c849f9f5ac338ea24ca04cbbf9afe5cad5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106213
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 962bd10e456d95c7579ffb380b3e69f67cf5ea11)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109401

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 9f83f29e1a89..197d43abf4b8 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -296,6 +296,11 @@ void SlideBackground::HandleContextChange(
 mpFillStyle->Hide();
 mpBackgroundLabel->Hide();
 mpInsertImage->Show();
+
+mpFillLB->Hide();
+mpFillAttr->Hide();
+mpFillGrad1->Hide();
+mpFillGrad2->Hide();
 }
 else if ( maContext == maImpressHandoutContext  || maContext == 
maImpressNotesContext )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/aboutdialog.ui |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 4ecabb10ff677cc326017220fb0cb908f9047a7b
Author: Heiko Tietze 
AuthorDate: Fri Jan 15 11:09:26 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 17 10:23:47 2021 +0100

Resolves tdf#139501 - About screen exceptional width

All strings wrap now

Change-Id: If810e67e55eb23685ab4e14da9d5da1864229833
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109337
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 284257980cf5..29fc5bc76ef2 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -153,6 +153,8 @@
 True
 False
 7.0
+True
+40
 0
 
   
@@ -168,6 +170,8 @@
 True
 False
 8 cores
+True
+40
 0
 
   
@@ -221,7 +225,7 @@
 False
 Calc
 True
-25
+40
 0
 
   
@@ -253,6 +257,8 @@
 True
 False
 English
+True
+40
 0
 
   
@@ -283,6 +289,8 @@
 True
 False
 VCL: gtk
+True
+40
 0
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/aboutdialog.ui |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 2da4f92666caa11ab39f45d9807af883a3c83c79
Author: Heiko Tietze 
AuthorDate: Fri Jan 15 11:09:26 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jan 17 10:23:19 2021 +0100

Resolves tdf#139501 - About screen exceptional width

All strings wrap now

Change-Id: If810e67e55eb23685ab4e14da9d5da1864229833
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109330
Tested-by: Adolfo Jayme Barrientos 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 0d8ebf8a5635..0121e26a2485 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -152,6 +152,8 @@
 True
 False
 7.0
+True
+40
 0
 
   
@@ -167,6 +169,8 @@
 True
 False
 8 cores
+True
+40
 0
 
   
@@ -220,7 +224,7 @@
 False
 Calc
 True
-25
+40
 0
 
   
@@ -252,6 +256,8 @@
 True
 False
 English
+True
+40
 0
 
   
@@ -282,6 +288,8 @@
 True
 False
 VCL: gtk
+True
+40
 0
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 xmloff/source/chart/ColorPropertySet.cxx |4 ++--
 xmloff/source/chart/ColorPropertySet.hxx |2 +-
 xmloff/source/chart/SchXMLExport.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 14d61304c3f54e59cb8912fbd76fec2e4171e478
Author: Noel Grandin 
AuthorDate: Sat Jan 16 19:26:04 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Jan 17 09:45:34 2021 +0100

use ::Color in ColorPropertySet constructor

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

diff --git a/xmloff/source/chart/ColorPropertySet.cxx 
b/xmloff/source/chart/ColorPropertySet.cxx
index 6e3e046923df..84313c0bb49f 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -76,8 +76,8 @@ sal_Bool SAL_CALL 
lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& N
 namespace xmloff::chart
 {
 
-ColorPropertySet::ColorPropertySet( sal_Int32 nColor ) :
-m_nColor( ColorTransparency, nColor ),
+ColorPropertySet::ColorPropertySet( ::Color nColor ) :
+m_nColor( nColor ),
 m_nDefaultColor( 0x0099ccff )  // blue 8
 {}
 
diff --git a/xmloff/source/chart/ColorPropertySet.hxx 
b/xmloff/source/chart/ColorPropertySet.hxx
index a69d326548bd..d5b42e39d58c 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -33,7 +33,7 @@ class ColorPropertySet : public ::cppu::WeakImplHelper<
 css::beans::XPropertyState >
 {
 public:
-explicit ColorPropertySet( sal_Int32 nColor );
+explicit ColorPropertySet( ::Color nColor );
 virtual ~ColorPropertySet() override;
 
 protected:
diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 0ae039da9a3e..9c99ac16167c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3392,7 +3392,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 {
 // property set only containing the color
 xPropSet.set( new ::xmloff::chart::ColorPropertySet(
-xColorScheme->getColorByIndex( nElement 
)));
+::Color(ColorTransparency, 
xColorScheme->getColorByIndex( nElement ;
 }
 SAL_WARN_IF( !xPropSet.is(), "xmloff.chart", "Pie Segments should 
have properties" );
 if( xPropSet.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d2baba68d32fa93e758dcc9c9a890206065ea9ac
Author: Mert Tumer 
AuthorDate: Thu Dec 10 11:59:06 2020 +0300
Commit: Mert Tumer 
CommitDate: Sun Jan 17 09:18:43 2021 +0100

fix rendershapeselection for drawing

Change-Id: Id4cb37885bf9b442adc679b895d89cd615ffb2ee
Signed-off-by: Mert Tumer 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108681
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109213
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 86cab63684f9..c8090aeff672 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3619,6 +3619,9 @@ static size_t 
doc_renderShapeSelection(LibreOfficeKitDocument* pThis, char** pOu
 case LOK_DOCTYPE_PRESENTATION:
 aMediaDescriptor["FilterName"] <<= 
OUString("impress_svg_Export");
 break;
+case LOK_DOCTYPE_DRAWING:
+aMediaDescriptor["FilterName"] <<= OUString("draw_svg_Export");
+break;
 case LOK_DOCTYPE_TEXT:
 aMediaDescriptor["FilterName"] <<= 
OUString("writer_svg_Export");
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b5bf573e480236cede84d09e3cb89144070fe373
Author: Xisco Fauli 
AuthorDate: Sat Jan 16 23:12:39 2021 +0100
Commit: Xisco Fauli 
CommitDate: Sun Jan 17 09:16:36 2021 +0100

sw_uiwriter3: dispose/clear the document before opening a new one

Change-Id: I6400eae69c4ab5edc719e9be0eb45e6dc2585a7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109458
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 69b0bd394514..75df4291e78f 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1505,6 +1505,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134626)
 Scheduler::ProcessEventsToIdle();
 TransferableDataHelper aHelper(xTransfer.get());
 
+mxComponent->dispose();
+mxComponent.clear();
+
 // Create a new document
 mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits