diff options
| author | Andre Fischer <af@apache.org> | 2013-05-17 12:23:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-21 18:44:05 +0100 |
| commit | 9a32ed36709cb03a8b5d3bcff0276bc31c934848 (patch) | |
| tree | 9f36e37f879925a39fc77f87f047a7a53ce177c4 | |
| parent | 2d00e944315ddbf25b1e566082ecbf576ea0dab6 (diff) | |
Resolves; #i122219# Show 'Cell Appearance' and 'Number Format' panels...
when editing cells.(cherry picked from commit 09d043596e8283dd6ced26d1e4ff0da530252df0)
Change-Id: I2fe0f9655efa24fb99b566f5c515b0fd1f651f6b
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 2 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 14 |
3 files changed, 2 insertions, 18 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index a92643a6c4fc..cd69c0114743 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -724,6 +724,7 @@ <value oor:separator=";"> Calc, Auditing, visible ; Calc, Cell, visible ; + Calc, EditCell, visible ; Calc, default, visible ; Calc, Pivot, visible ; </value> @@ -753,6 +754,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 0fed648f41a5..9a16ad5fae75 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -294,8 +294,6 @@ const SharedPanelContainer& Deck::GetPanels (void) const void Deck::RequestLayout (void) { - // PrintWindowTree(); - DeckLayouter::LayoutDeck( GetContentArea(), maPanels, @@ -304,8 +302,6 @@ void Deck::RequestLayout (void) *mpScrollContainer, *mpFiller, *mpVerticalScrollBar); - - Invalidate(); } diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index af0a54771aa0..7cc315e7acf7 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -518,20 +518,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) { |