[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry sfx2/source

[Andre Fischer]

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |    2 +
 sfx2/source/sidebar/Deck.cxx                                 |    4 ---
 sfx2/source/sidebar/SidebarController.cxx                    |   14 -----------
 3 files changed, 2 insertions(+), 18 deletions(-)

New commits:
commit 09d043596e8283dd6ced26d1e4ff0da530252df0
Author: Andre Fischer <af at apache.org>
Date:   Fri May 17 12:23:50 2013 +0000

    122219: Show 'Cell Appearance' and 'Number Format' panels when editing cells.

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 927747c..d05cdae 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -752,6 +752,7 @@
           <value oor:separator=";">
             Calc,  Auditing, visible ;
             Calc,  Cell,     visible ;
+            Calc,  EditCell, visible ;
             Calc,  default,  visible ;
             Calc,  Pivot,    visible ;
           </value>
@@ -781,6 +782,7 @@
           <value oor:separator=";">
             Calc,  Auditing, hidden ;
             Calc,  Cell,     hidden ;
+            Calc,  EditCell, hidden ;
             Calc,  default,  hidden ;
             Calc,  Pivot,    hidden ;
           </value>
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 76a83b1..416fb0d 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -299,8 +299,6 @@ const SharedPanelContainer& Deck::GetPanels (void) const
 
 void Deck::RequestLayout (void)
 {
-    //    PrintWindowTree();
-
     DeckLayouter::LayoutDeck(
         GetContentArea(),
         maPanels,
@@ -309,8 +307,6 @@ void Deck::RequestLayout (void)
         *mpScrollContainer,
         *mpFiller,
         *mpVerticalScrollBar);
-
-    Invalidate();
 }
 
 
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index fd0a1af..a6a4d73 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -526,20 +526,6 @@ void SidebarController::SwitchToDeck (
         }
     }
 
-    if (mpCurrentDeck
-        && ArePanelSetsEqual(mpCurrentDeck->GetPanels(), aPanelContextDescriptors))
-    {
-        // Requested set of panels is identical to the current set of
-        // panels => Nothing to do.
-        return;
-    }
-
-        // When the document is read-only, check if there are any panels that can still be displayed.
-    if (mbIsDocumentReadOnly)
-    {
-    }
-
-
     // Provide a configuration and Deck object.
     if ( ! mpCurrentDeck)
     {