[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-6' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5193f7fd1d4bbabc783621c7707075f09d679ad6
Author: Caolán McNamara caol...@redhat.com
Date: Sat Jan 24 20:37:36 2015 +
Resolves: tdf#81124 crash on setting autofilter on column with no content
Change-Id: Id53e589789144d892427a8a4ec1af1926aa97b52
(cherry picked from commit 3a5fa612b4afb72b5f91877a5c52e25c7604ae1a)
Reviewed-on: https://gerrit.libreoffice.org/14160
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 1b05eff..51166aa 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1091,6 +1091,8 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool
bSet)
{
setAllMemberState(!bSet);
SvTreeListEntry* pEntry = maChecks.GetCurEntry();
+if (!pEntry)
+return;
maChecks.CheckEntry(pEntry, bSet );
}
@@ -1486,7 +1488,6 @@ void ScCheckListBox::KeyInput( const KeyEvent rKEvt )
if ( rKey.GetCode() == KEY_RETURN || rKey.GetCode() == KEY_SPACE )
{
SvTreeListEntry* pEntry = GetCurEntry();
-
if ( pEntry )
{
bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-6' - sc/source
sc/source/ui/dbgui/tpsort.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2a19ea84b7498d323b8737e0df86037755181c93
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 23 14:42:28 2015 +
Resolves: fdo#88735 crash after calling sort after subtotal removal
Change-Id: Ia30271426ea47b7bf5af85d16591a02e6d52b3d9
(cherry picked from commit 0442cd217645aa4fdd924e4c2e4f90a77f1fbbad)
Reviewed-on: https://gerrit.libreoffice.org/14141
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index a9a793c..1f21119 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -151,7 +151,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet /*
rArgSet */ )
FillFieldLists(0);
// ListBox selection:
-if ( aSortData.maKeyState[0].bDoSort )
+if (!aSortData.maKeyState.empty() aSortData.maKeyState[0].bDoSort)
{
// Make sure that the all sort keys are reset
for ( sal_uInt16 i=nSortKeyCount; iaSortData.GetSortKeyCount(); i++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-6' - sc/source
sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2d2a5bf76d9bfa3bc2951d50e79fe79651569cbd
Author: Caolán McNamara caol...@redhat.com
Date: Sat Jan 24 20:59:27 2015 +
Resolves: rhbz#1179642 crash in GetFocus with empty
mpPreviouslyFocusedListBox
Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76
(cherry picked from commit dae7d2089516d9cf014b9fad0adb484f19282a29)
Reviewed-on: https://gerrit.libreoffice.org/14163
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index 3710e4c..34fd1f7 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -123,9 +123,10 @@ void ScPivotLayoutTreeListBase::GetFocus()
if( GetGetFocusFlags() GETFOCUS_MNEMONIC )
{
SvTreeListEntry* pEntry =
mpParent-mpPreviouslyFocusedListBox-GetCurEntry();
-InsertEntryForSourceTarget(pEntry, NULL);
+if (pEntry)
+InsertEntryForSourceTarget(pEntry, NULL);
-if(mpParent-mpPreviouslyFocusedListBox != NULL)
+if (mpParent-mpPreviouslyFocusedListBox != NULL)
mpParent-mpPreviouslyFocusedListBox-GrabFocus();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-6' - sc/source
sc/source/core/data/documen4.cxx |3 ++-
sc/source/core/data/documentimport.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 8c191fa956ec650296a351695ff10f8f8e536ca9
Author: Eike Rathke er...@redhat.com
Date: Fri Jan 23 14:28:54 2015 +0100
fix abuse of OUStringBuffer(int) ctor
Partial backport of 853c2fc71a96755a9dee629fd5d0e1cff9a48034
Change-Id: I14e26da332a829c6381ee9e07571171ebebe0ac0
Reviewed-on: https://gerrit.libreoffice.org/14134
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 6e0da40..17b54985 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -375,7 +375,8 @@ void ScDocument::InsertTableOp(const ScTabOpParam rParam,
// Mehrfachopera
}
ScRefAddress aRef;
-OUStringBuffer aForString('=');
+OUStringBuffer aForString;
+aForString.append('=');
aForString.append(ScCompiler::GetNativeSymbol(ocTableOp));
aForString.append(ScCompiler::GetNativeSymbol( ocOpen));
diff --git a/sc/source/core/data/documentimport.cxx
b/sc/source/core/data/documentimport.cxx
index 32ff6fb..5f285cb 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -333,7 +333,8 @@ void ScDocumentImport::setTableOpCells(const ScRange
rRange, const ScTabOpParam
ScDocument* pDoc = mpImpl-mrDoc;
ScRefAddress aRef;
-OUStringBuffer aFormulaBuf('=');
+OUStringBuffer aFormulaBuf;
+aFormulaBuf.append('=');
aFormulaBuf.append(ScCompiler::GetNativeSymbol(ocTableOp));
aFormulaBuf.append(ScCompiler::GetNativeSymbol(ocOpen));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-6' - sc/source
sc/source/ui/dbgui/PivotLayoutTreeList.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 44ee9731b6ac11699cb9066a8577aba32cab7ab9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 22 13:39:21 2015 +
Resolves: fdo#88455 delete in empty data field crashes
Change-Id: I399bf576fe89283f839842959f06b8fe83f13b2b
(cherry picked from commit 66df4d7d309ce237e4979d57b1069659ece1e3a5)
Reviewed-on: https://gerrit.libreoffice.org/14110
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index 32c55ce..4c6121e 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -38,7 +38,11 @@ void ScPivotLayoutTreeList::Setup(ScPivotLayoutDialog*
pParent, SvPivotTreeListT
bool ScPivotLayoutTreeList::DoubleClickHdl()
{
-ScItemValue* pCurrentItemValue = (ScItemValue*)
GetCurEntry()-GetUserData();
+SvTreeListEntry* pEntry = GetCurEntry();
+if (!pEntry)
+return false;
+
+ScItemValue* pCurrentItemValue = (ScItemValue*) pEntry-GetUserData();
ScPivotFuncData rCurrentFunctionData = pCurrentItemValue-maFunctionData;
if (mpParent-IsDataElement(rCurrentFunctionData.mnCol))
@@ -105,11 +109,12 @@ void ScPivotLayoutTreeList::KeyInput(const KeyEvent
rKeyEvent)
KeyCode aCode = rKeyEvent.GetKeyCode();
sal_uInt16 nCode = aCode.GetCode();
-switch (nCode)
+if (nCode == KEY_DELETE)
{
-case KEY_DELETE:
-GetModel()-Remove(GetCurEntry());
-return;
+const SvTreeListEntry* pEntry = GetCurEntry();
+if (pEntry)
+GetModel()-Remove(pEntry);
+return;
}
SvTreeListBox::KeyInput(rKeyEvent);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-6' - sc/source
sc/source/core/tool/rangenam.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e6d4d4941db42184d7e7b68960a1affd7c61101
Author: Eike Rathke er...@redhat.com
Date: Thu Jan 22 23:36:23 2015 +0100
Resolves: fdo#88721 correct negated condition in range name validation
Fallout of 72b9dd277bab328c4d9227439e27e8c29b43fa7d String to OUString
conversion.
(cherry picked from commit 34f8864c9af563cbcd34352b3edefc67ba235ae7)
Conflicts:
sc/source/core/tool/rangenam.cxx
Change-Id: I89a90da11790efba9e8ce4c9464dfca50b08c3ce
Reviewed-on: https://gerrit.libreoffice.org/14122
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 3fb839e..0c08f31 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -460,7 +460,7 @@ void ScRangeData::MakeValidName( OUString rName )
{
//! Range Parse is partially valid also with invalid sheet name,
//! Address Parse dito, during compile name would generate a #REF!
-if ( rName.indexOf( '.' ) == -1 )
+if ( rName.indexOf( '.' ) != -1 )
rName = rName.replaceFirst( ., _ );
else
rName = _ + rName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
