[Libreoffice-commits] core.git: Branch 'feature/fixes38' - 4 commits - sc/source sw/source
László Németh
laszlo.nemeth at collabora.com
Fri Mar 3 00:19:56 UTC 2017
sc/source/core/inc/arraysumfunctor.hxx | 2 +-
sc/source/core/tool/calcconfig.cxx | 8 +-------
sw/source/uibase/inc/wrtsh.hxx | 4 ++--
sw/source/uibase/uno/unotxvw.cxx | 12 ++++++++----
sw/source/uibase/wrtsh/move.cxx | 8 ++++----
5 files changed, 16 insertions(+), 18 deletions(-)
New commits:
commit 194e386b6b95e7728d6dfc26e0efffc252c94583
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Thu Mar 2 23:56:34 2017 +0000
Revert "arraysumfunctor: fast sum a double array..."
This reverts commit 5493402fb37a1def960c93f7c31aff36a5ab5f9e.
Change-Id: Ib3d0029fdb7666eec1e8fcbe6703091367f034c3
diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx
index d94bf74..69ab069 100644
--- a/sc/source/core/inc/arraysumfunctor.hxx
+++ b/sc/source/core/inc/arraysumfunctor.hxx
@@ -43,7 +43,7 @@ public:
double operator() ()
{
- static bool hasSSE2 = tools::cpuid::hasSSE2();
+ static bool hasSSE2 = false;
double fSum = 0.0;
size_t i = 0;
commit 3f7a4f224f8f08fb11e52989e0e7c96bfcb22953
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Thu Mar 2 22:40:46 2017 +0000
Revert of "Add VLOOKUP to the set of opcodes..."
that we trust the OpenCL implementation for
commit 7bb7539c0e34283baeaacf7e4ff0b19287afadc2
Change-Id: Iebe545652b3bfbdcb50c9d7fa9e687d4523cbd8b
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index 9035f7d..3cdebfb 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -85,7 +85,6 @@ void ScCalcConfig::setOpenCLConfigToDefault()
ocCount,
ocVar,
ocNormDist,
- ocVLookup,
ocCorrel,
ocCovar,
ocPearson,
commit 4a795e40ab7125955a2612a9e803bca446bbbf47
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Thu Mar 2 23:26:12 2017 +0000
Revert "tdf#100051 Partially revert "loplugin:constantparam in sw""
This reverts commit de9ae2ffab45bf6a2ddb2dcba961591bd9b693da.
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 0f8ccda..5a36e7e 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -191,8 +191,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
sal_uInt16 nCount, bool bBasicCall, bool bVisual = false );
bool Right ( sal_uInt16 nMode, bool bSelect,
sal_uInt16 nCount, bool bBasicCall, bool bVisual = false );
- bool Up ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false );
- bool Down ( bool bSelect, sal_uInt16 nCount = 1, bool bBasicCall = false );
+ bool Up ( bool bSelect, bool bBasicCall = false );
+ bool Down ( bool bSelect, bool bBasicCall = false );
void NxtWrd ( bool bSelect = false ) { SimpleMove( &SwWrtShell::NxtWrd_, bSelect ); }
bool PrvWrd ( bool bSelect = false ) { return SimpleMove( &SwWrtShell::PrvWrd_, bSelect ); }
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index ecbb9df..2eb2f50 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -1000,7 +1000,8 @@ sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand)
if (!IsTextSelection())
throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
- bRet = m_pView->GetWrtShell().Left( CRSR_SKIP_CHARS, bExpand, nCount, true );
+ for( sal_uInt16 i = 0; i < nCount; i++ )
+ bRet = m_pView->GetWrtShell().Left( CRSR_SKIP_CHARS, bExpand, 1, true );
}
else
throw uno::RuntimeException();
@@ -1017,7 +1018,8 @@ sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand)
if (!IsTextSelection())
throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
- bRet = m_pView->GetWrtShell().Right( CRSR_SKIP_CHARS, bExpand, nCount, true );
+ for( sal_uInt16 i = 0; i < nCount; i++ )
+ bRet = m_pView->GetWrtShell().Right( CRSR_SKIP_CHARS, bExpand, 1, true );
}
else
throw uno::RuntimeException();
@@ -1614,7 +1616,8 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
if (!IsTextSelection())
throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
- bRet = m_pView->GetWrtShell().Down( bExpand, nCount, true );
+ for( sal_uInt16 i = 0; i < nCount; i++ )
+ bRet = m_pView->GetWrtShell().Down( bExpand, true );
}
else
throw uno::RuntimeException();
@@ -1631,7 +1634,8 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand)
if (!IsTextSelection())
throw uno::RuntimeException("no text selection", static_cast < cppu::OWeakObject * > ( this ) );
- bRet = m_pView->GetWrtShell().Up( bExpand, nCount, true );
+ for( sal_uInt16 i = 0; i < nCount; i++ )
+ bRet = m_pView->GetWrtShell().Up( bExpand, true );
}
else
throw uno::RuntimeException();
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 7125044..81b9c7a 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -127,7 +127,7 @@ bool SwWrtShell::Right( sal_uInt16 nMode, bool bSelect,
}
}
-bool SwWrtShell::Up( bool bSelect, sal_uInt16 nCount, bool bBasicCall )
+bool SwWrtShell::Up( bool bSelect, bool bBasicCall )
{
if ( !bSelect && !bBasicCall && IsCursorReadonly() && !GetViewOptions()->IsSelectionInReadonly())
{
@@ -138,10 +138,10 @@ bool SwWrtShell::Up( bool bSelect, sal_uInt16 nCount, bool bBasicCall )
}
ShellMoveCursor aTmp( this, bSelect );
- return SwCursorShell::Up(nCount);
+ return SwCursorShell::Up();
}
-bool SwWrtShell::Down( bool bSelect, sal_uInt16 nCount, bool bBasicCall )
+bool SwWrtShell::Down( bool bSelect, bool bBasicCall )
{
if ( !bSelect && !bBasicCall && IsCursorReadonly() && !GetViewOptions()->IsSelectionInReadonly())
{
@@ -153,7 +153,7 @@ bool SwWrtShell::Down( bool bSelect, sal_uInt16 nCount, bool bBasicCall )
}
ShellMoveCursor aTmp( this, bSelect );
- return SwCursorShell::Down(nCount);
+ return SwCursorShell::Down();
}
bool SwWrtShell::LeftMargin( bool bSelect, bool bBasicCall )
commit ec28071efbc47eec4ffcb8aa31042c01d398f29b
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Thu Mar 2 23:45:51 2017 +0000
Revert "sc: Implement Software Interpreter subsetting..."
This reverts commit a81de86c47322bd6bc59b462eb2f69e0f1185df4
Change-Id: I29d34155dc841ca7226386141d2e1308f3c3d1c7
29d34155dc841ca7226386141d2e1308f3c3d1c7
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index 96277ce..9035f7d 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -94,12 +94,7 @@ void ScCalcConfig::setOpenCLConfigToDefault()
// opcodes that are known to work well with the software interpreter
static OpCodeSet pDefaultSwInterpreterSubsetOpCodes(new std::set<OpCode>({
- ocAdd,
- ocSub,
- ocMul,
- ocDiv,
- ocSum,
- ocProduct}));
+ }));
// Note that these defaults better be kept in sync with those in
// officecfg/registry/schema/org/openoffice/Office/Calc.xcs.
More information about the Libreoffice-commits
mailing list