[Libreoffice-commits] .: 3 commits - sc/source

[Markus Mohrhard]

 sc/source/ui/condformat/condformatdlg.cxx |    3 ++-
 sc/source/ui/view/cellsh1.cxx             |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit df0334b9a53e3144ef87f5dda96a95626f2746cf
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jun 30 19:09:24 2012 +0200

    show correct preview when opening the dialog, fdo#51590
    
    Change-Id: I58059655ca45c944e260cabbe348ed690dad3a22

diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index afa7575..6c4865b 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -214,6 +214,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc, const ScForm
         const ScCondFormatEntry* pEntry = static_cast<const ScCondFormatEntry*>(pFormatEntry);
         rtl::OUString aStyleName = pEntry->GetStyle();
         maLbStyle.SelectEntry(aStyleName);
+        StyleSelectHdl(NULL);
         ScConditionMode eMode = pEntry->GetOperation();
         maLbType.SelectEntryPos(1);
         maEdVal1.SetText(pEntry->GetExpression(maPos, 0));
commit 74f46aaa4b9ecffc8d20b0d22bb36625eeb4391d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jun 30 18:39:37 2012 +0200

    correctly calculate scroll bar position, related fdo#51599
    
    Change-Id: I9e44e82873e99f3063c4ed9dff83613b53327872

diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 6f5ca81..afa7575 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -1012,7 +1012,7 @@ void ScCondFormatList::RecalcAll()
         mpScrollBar->Hide();
     }
 
-    Point aPoint(0,0);
+    Point aPoint(0,-1*mpScrollBar->GetThumbPos());
     for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr)
     {
         itr->SetPosPixel(aPoint);
commit 53327abd436bf24076f624c56b3dee2f3f0eedcb
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jun 30 18:30:42 2012 +0200

    handle single cell conditional formats correctly, fdo#51555
    
    Change-Id: Ic0b171b182eae86010de316ff5ed435e76b09d12

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 52d3390..7ce2a6a 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2045,6 +2045,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                 ScDocument* pDoc = pData->GetDocument();
 
                 ScAddress aPos(pData->GetCurX(), pData->GetCurY(), pData->GetTabNo());
+                if(aRangeList.empty())
+                {
+                    ScRange* pRange = new ScRange(aPos);
+                    aRangeList.push_back(pRange);
+                }
+
                 AbstractScCondFormatDlg* pDlg = NULL;
                 const ScConditionalFormat* pCondFormat = pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab());
                 if(pCondFormat)