configure.ac | 2 +-
sc/Library_scui.mk | 4 ++++
sc/source/ui/optdlg/tpcalc.cxx | 15 +++++++++++++++
sc/source/ui/view/tabview3.cxx | 5 +++--
translations | 2 +-
5 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 7c4ad801bf9812851d911aca1a6c8d8a965f475a
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu May 18 12:40:07 2017 +0200
bump product version to 5.5.0.0.alpha0+
Change-Id: I131165b9fc6005d71e02432499647a252ef3e78d
diff --git a/configure.ac b/configure.ac
index 588aa77afcbd..7286781a7f08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[5.4.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.5.0.0.alpha0+],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 9feb7f7039a3b59974cbf266922177e961a52dd1
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu May 18 12:16:53 2017 +0200
Updated core
Project: translations ffe364726be8d78394cc5080d928b354e65febfb
another update of translations for 5.4.0 beta1
force-fixed using pocheck
Change-Id: I9e116bae500ed37d06b66397f2d815fb2e5dd22b
diff --git a/translations b/translations
index 28d70b17f056..ffe364726be8 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 28d70b17f056afa54f3a68a0fe68f517f44f4d46
+Subproject commit ffe364726be8d78394cc5080d928b354e65febfb
commit ab34329ce2c5d6c1e340155e1b2f6d65f5fb162b
Author: Aron Budea <aron.bu...@collabora.com>
Date: Fri May 12 17:33:43 2017 +0200
Respect read-only config items in Options/Calc/Calculate dialog
Read-only state is now read except for settings in General
Calculations (except Decimal places).
Change-Id: Ia947f6657ae5638c414bf4e82fac314b5993f4c5
Reviewed-on: https://gerrit.libreoffice.org/37546
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 2f2a5d6ac6d1..d576ca51a5c1 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -24,6 +24,10 @@ $(eval $(call gb_Library_use_custom_headers,scui,\
$(eval $(call
gb_Library_set_precompiled_header,scui,$(SRCDIR)/sc/inc/pch/precompiled_scui))
+$(eval $(call gb_Library_use_custom_headers,scui,\
+ officecfg/registry \
+))
+
$(eval $(call gb_Library_use_sdk_api,scui))
$(eval $(call gb_Library_use_externals,scui,\
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index a62dc732bacb..5f9cc4b3dc4b 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -30,6 +30,7 @@
#include "docoptio.hxx"
#include "scresid.hxx"
#include "sc.hrc"
+#include <officecfg/Office/Calc.hxx>
#include "tpcalc.hxx"
@@ -118,16 +119,30 @@ void ScTpCalcOptions::Reset( const SfxItemSet* /*
rCoreAttrs */ )
*pLocalOptions = *pOldOptions;
m_pBtnCase->Check( !pLocalOptions->IsIgnoreCase() );
+ m_pBtnCase->Enable(
!officecfg::Office::Calc::Calculate::Other::CaseSensitive::isReadOnly() );
m_pBtnCalc->Check( pLocalOptions->IsCalcAsShown() );
+ m_pBtnCalc->Enable(
!officecfg::Office::Calc::Calculate::Other::Precision::isReadOnly() );
m_pBtnMatch->Check( pLocalOptions->IsMatchWholeCell() );
+ m_pBtnMatch->Enable(
!officecfg::Office::Calc::Calculate::Other::SearchCriteria::isReadOnly() );
bool bWildcards = pLocalOptions->IsFormulaWildcardsEnabled();
bool bRegex = pLocalOptions->IsFormulaRegexEnabled();
if (bWildcards && bRegex)
bRegex = false;
m_pBtnWildcards->Check( bWildcards );
m_pBtnRegex->Check( bRegex );
+ m_pBtnWildcards->Enable(
!officecfg::Office::Calc::Calculate::Other::Wildcards::isReadOnly() );
+ m_pBtnRegex->Enable(
!officecfg::Office::Calc::Calculate::Other::RegularExpressions::isReadOnly() );
m_pBtnLiteral->Check( !bWildcards && !bRegex );
+ m_pBtnLiteral->Enable( m_pBtnWildcards->IsEnabled() ||
m_pBtnRegex->IsEnabled() );
+ // if either regex or wildcards radio button is set and read-only, disable
all three
+ if ( (!m_pBtnWildcards->IsEnabled() && bWildcards) ||
(!m_pBtnRegex->IsEnabled() && bRegex) )
+ {
+ m_pBtnWildcards->Enable( false );
+ m_pBtnRegex->Enable( false );
+ m_pBtnLiteral->Enable( false );
+ }
m_pBtnLookUp->Check( pLocalOptions->IsLookUpColRowNames() );
+ m_pBtnLookUp->Enable(
!officecfg::Office::Calc::Calculate::Other::FindLabel::isReadOnly() );
m_pBtnIterate->Check( pLocalOptions->IsIter() );
m_pEdSteps->SetValue( pLocalOptions->GetIterCount() );
m_pEdEps->SetValue( pLocalOptions->GetIterEps(), 6 );
commit 3f5143f5b8699afd75dd80cc69e5a9c021e7c5ac
Author: Henry Castro <hcas...@collabora.com>
Date: Wed May 17 16:19:47 2017 -0400
sc lok: fix wrong assignment aEnd.X()
In tiled rendering case, the window size is small and the end
point will be cut, then result wrong invalidation area
Conflicts:
sc/source/ui/view/tabview3.cxx
Change-Id: Ief49c5f47bbc69485354ab396c7508db9548f82a
Reviewed-on: https://gerrit.libreoffice.org/37737
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 75da8d86159e..9cf18abfe6e2 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2228,6 +2228,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW
nStartRow, SCCOL nEndCol, SCRO
SCROW nRow1;
SCCOL nCol2;
SCROW nRow2;
+ bool bIsTiledRendering = comphelper::LibreOfficeKit::isActive();
PutInOrder( nStartCol, nEndCol );
PutInOrder( nStartRow, nEndRow );
@@ -2249,7 +2250,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW
nStartRow, SCCOL nEndCol, SCRO
SCCOL nLastX = 0;
SCROW nLastY = 0;
- if (comphelper::LibreOfficeKit::isActive())
+ if (bIsTiledRendering)
{
nLastX = aViewData.GetMaxTiledCol();
nLastY = aViewData.GetMaxTiledRow();
@@ -2296,7 +2297,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW
nStartRow, SCCOL nEndCol, SCRO
Point aStart = aViewData.GetScrPos( nCol1, nRow1, (ScSplitPos) i );
Point aEnd = aViewData.GetScrPos( nCol2+1, nRow2+1, (ScSplitPos) i );
if ( eMode == ScUpdateMode::All )
- aEnd.X() = bLayoutRTL ? 0 :
(pGridWin[i]->GetOutputSizePixel().Width());
+ aEnd.X() = bLayoutRTL ? 0 : (bIsTiledRendering ? aEnd.X() :
pGridWin[i]->GetOutputSizePixel().Width());
aEnd.X() -= nLayoutSign;
aEnd.Y() -= 1;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
