[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 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 86869dea4b76e35ee3ed3d0795f4f7dfc978e7d3
Author: Markus Mohrhard <markus.mohrh...@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 ca84b2b..0d20878 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2061,6 +2061,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)
commit 62b4026212d2f5e4ee26acf70b09b7e8f2eb6e63
Author: Markus Mohrhard <markus.mohrh...@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 862df3e..8c2aa1d 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -1027,7 +1027,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 d500b55a4ab9b4ec29b8432a638dfb5a1da6fe6c
Author: Markus Mohrhard <markus.mohrh...@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 486dcb1..862df3e 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));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits