[Libreoffice-commits] core.git: basctl/source chart2/source

2021-11-03 Thread Natalia Gavrilova (via logerrit) 
 basctl/source/basicide/moduldl2.cxx|2 +-
 basctl/source/basicide/moduldlg.hxx|2 +-
 chart2/source/controller/dialogs/res_DataLabel.cxx |6 +++---
 chart2/source/controller/dialogs/res_DataLabel.hxx |4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 0a059912bae4e3bc0b2640efb4e163d79f54a5d7
Author: Natalia Gavrilova 
AuthorDate: Mon Oct 11 08:42:18 2021 +0300
Commit: Michael Stahl 
CommitDate: Wed Nov 3 10:07:48 2021 +0100

tdf#114441 Convert use of sal_uLong to sal_uInt32, int

* Changed moduldlg.hxx, moduldl2.cxx
* Changed res_DataLabel.hxx, res_DataLabel.cxx

Change-Id: I845c9fb7b60b5a8f898aaac433c0b5e520c58678
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123360
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 7be53296159a..6c183c33035e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1226,7 +1226,7 @@ void LibPage::SetCurLib()
 m_xLibBox->set_cursor(nEntry_);
 }
 
-void LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos )
+void LibPage::ImpInsertLibEntry( const OUString& rLibName, int nPos )
 {
 // check, if library is password protected
 bool bProtected = false;
diff --git a/basctl/source/basicide/moduldlg.hxx 
b/basctl/source/basicide/moduldlg.hxx
index b7fb13d8901e..63be9953a290 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -189,7 +189,7 @@ class LibPage final : public OrganizePage
 voidFillListBox();
 voidInsertListBoxEntry( const ScriptDocument& rDocument, 
LibraryLocation eLocation );
 voidSetCurLib();
-voidImpInsertLibEntry( const OUString& rLibName, sal_uLong 
nPos );
+voidImpInsertLibEntry( const OUString& rLibName, int nPos 
);
 
 public:
 explicit LibPage(weld::Container* pParent, OrganizeDialog* pDialog);
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 841b75d2f9ef..6bba918d6937 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -46,7 +46,7 @@ namespace
 
 const std::u16string_view our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u". 
"};
 
-bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 
nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& 
rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
+bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 
nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uInt32& rnFormatKeyOut, bool& 
rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
 {
 bool bSet = false;
 const SfxPoolItem *pItem1 = nullptr;
@@ -191,7 +191,7 @@ IMPL_LINK(DataLabelResources, NumberFormatDialogHdl, 
weld::Button&, rButton, voi
 
 bool bPercent = ( == m_xPB_NumberFormatForPercent.get());
 
-sal_uLong& rnFormatKey = bPercent ? m_nNumberFormatForPercent : 
m_nNumberFormatForValue;
+sal_uInt32& rnFormatKey = bPercent ? m_nNumberFormatForPercent : 
m_nNumberFormatForValue;
 bool& rUseSourceFormat = bPercent ? m_bSourceFormatForPercent : 
m_bSourceFormatForValue;
 bool& rbMixedState = bPercent ? m_bPercentFormatMixedState : 
m_bNumberFormatMixedState;
 bool& rbSourceMixedState = bPercent ? m_bPercentSourceMixedState : 
m_bSourceFormatMixedState;
@@ -210,7 +210,7 @@ IMPL_LINK(DataLabelResources, NumberFormatDialogHdl, 
weld::Button&, rButton, voi
 if( pResult )
 {
 bool bOldSource = rUseSourceFormat;
-sal_uLong nOldFormat = rnFormatKey;
+sal_uInt32 nOldFormat = rnFormatKey;
 bool bOldMixedState = rbMixedState || rbSourceMixedState;
 
 rbMixedState = !lcl_ReadNumberFormatFromItemSet( *pResult, 
SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_SOURCE, rnFormatKey, 
rUseSourceFormat, rbSourceMixedState );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx 
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 094291dc9a23..56115b2a779c 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -47,8 +47,8 @@ private:
 SvNumberFormatter*  m_pNumberFormatter;
 boolm_bNumberFormatMixedState;
 boolm_bPercentFormatMixedState;
-sal_uLong   m_nNumberFormatForValue;
-sal_uLong   m_nNumberFormatForPercent;
+sal_uInt32  m_nNumberFormatForValue;
+sal_uInt32  m_nNumberFormatForPercent;
 
 boolm_bSourceFormatMixedState;
 boolm_bPercentSourceMixedState;

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

2021-10-09 Thread Natalia Gavrilova (via logerrit) 
 sc/source/ui/view/gridwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c307c34a295fbbaf0af91a17440b045133981cc8
Author: Natalia Gavrilova 
AuthorDate: Sat Oct 9 08:31:47 2021 +0300
Commit: Heiko Tietze 
CommitDate: Sat Oct 9 10:26:49 2021 +0200

tdf#142121 Cell focus rectangle does not use font color

* The black square in the down right corner is also
  highlight color now

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

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 124650b459f6..311a59d8dbcd 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6464,7 +6464,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
 }
 else if (xOverlayManager.is())
 {
-Color aHandleColor( 
SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
+Color aHandleColor = 
GetSettings().GetStyleSettings().GetHighlightColor();
 if (mrViewData.GetActivePart() != eWhich)
 // non-active pane uses a different color.
 aHandleColor = 
SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;

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

2021-09-27 Thread Natalia Gavrilova (via logerrit) 
 sc/source/ui/view/gridwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1c318e9f18f6a4e56d42fc7b7c5c2942b28941d
Author: Natalia Gavrilova 
AuthorDate: Fri Sep 24 22:31:44 2021 +0300
Commit: Heiko Tietze 
CommitDate: Mon Sep 27 09:29:12 2021 +0200

tdf#142121 Cell focus rectangle does not use font color

* Focused rectangle uses highlight color instead of font

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

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 16ce773a287b..ef01c2ab1abe 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6264,7 +6264,7 @@ void ScGridWindow::UpdateCursorOverlay()
 
 if (xOverlayManager.is())
 {
-Color aCursorColor( 
SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
+Color aCursorColor = 
GetSettings().GetStyleSettings().GetHighlightColor();
 if (mrViewData.GetActivePart() != eWhich)
 // non-active pane uses a different color.
 aCursorColor = 
SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;