sfx2/source/sidebar/SidebarController.cxx | 13 ++++++++++--- sfx2/source/sidebar/SidebarController.hxx | 1 + sw/source/ui/sidebar/PageSizeControl.cxx | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-)
New commits: commit 2d00e944315ddbf25b1e566082ecbf576ea0dab6 Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Fri May 17 11:35:46 2013 +0000 Resolves: #i122310# page property panel, page size control display page size as Width x Height (cherry picked from commit b83fb522809c9b54427f60200164f878ae7f4658) Conflicts: sw/source/ui/sidebar/PageSizeControl.cxx Change-Id: I150eb045366ee1a712f2a7fc992d5ac76b7e19d7 diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx b/sw/source/ui/sidebar/PageSizeControl.cxx index 1f6cfd8..ca77f91 100644 --- a/sw/source/ui/sidebar/PageSizeControl.cxx +++ b/sw/source/ui/sidebar/PageSizeControl.cxx @@ -111,9 +111,9 @@ PageSizeControl::PageSizeControl( maWidthHeightField.IsUseThousandSep(), maWidthHeightField.IsShowTrailingZeros() ); - ItemText2 = HeightStr; + ItemText2 = WidthStr; ItemText2 += OUString(" x "); - ItemText2 += WidthStr; + ItemText2 += HeightStr; ItemText2 += OUString(" "); ItemText2 += aMetricStr; commit 63fca6b8040f08f815378cd933e7cb66eee40346 Author: Caolán McNamara <caol...@redhat.com> Date: Tue May 21 17:03:14 2013 +0100 avoid static OUStrings here Change-Id: Idd53eeaccc7d99b35ce16e30ee6d531e0cf6c34c diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 4447bed..af0a547 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -66,7 +66,7 @@ using ::rtl::OUString; namespace { - const static OUString gsReadOnlyCommandName (A2S(".uno:EditDoc")); + const static char gsReadOnlyCommandName[] = ".uno:EditDoc"; const static sal_Int32 gnMaximumSidebarWidth (400); const static sal_Int32 gnWidthCloseThreshold (70); const static sal_Int32 gnWidthOpenThreshold (40); @@ -88,7 +88,7 @@ namespace { /** When in doubt, show this deck. */ - static const ::rtl::OUString gsDefaultDeckId(A2S("PropertyDeck")); + static const char gsDefaultDeckId[] = "PropertyDeck"; } commit adb2d846e0912918708f2242997665dae5ed7478 Author: Andre Fischer <a...@apache.org> Date: Fri May 17 11:13:52 2013 +0000 Resolvs: #i122082# React to changes read-only <-> read-write more reliably (cherry picked from commit a30912ea805a74f2ef47e10511d6e85ed4600b73) Change-Id: I735ea32a498413f663efaf0e22051ab4d2d92ef5 diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index d831cee..4447bed 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -85,6 +85,10 @@ namespace { MID_FIRST_PANEL, MID_FIRST_HIDE = 1000 }; + + /** When in doubt, show this deck. + */ + static const ::rtl::OUString gsDefaultDeckId(A2S("PropertyDeck")); } @@ -102,7 +106,7 @@ SidebarController::SidebarController ( mxFrame(rxFrame), maCurrentContext(OUString(), OUString()), maRequestedContext(), - msCurrentDeckId(A2S("PropertyDeck")), + msCurrentDeckId(gsDefaultDeckId), msCurrentDeckTitle(), maPropertyChangeForwarder(::boost::bind(&SidebarController::BroadcastPropertyChange, this)), maContextChangeUpdate(::boost::bind(&SidebarController::UpdateConfigurations, this)), @@ -252,7 +256,10 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv mbIsDocumentReadOnly = !bIsReadWrite; // Force the current deck to update its panel list. - SwitchToDeck(msCurrentDeckId); + if ( ! mbIsDocumentReadOnly) + msCurrentDeckId = gsDefaultDeckId; + maCurrentContext = Context(); + maContextChangeUpdate.RequestCall(); } } diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index df288bf..dc62f7a 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -159,6 +159,7 @@ private: /** Make maRequestedContext the current context. */ void UpdateConfigurations (void); + bool ArePanelSetsEqual ( const SharedPanelContainer& rCurrentPanels, const ResourceManager::PanelContextDescriptorContainer& rRequestedPanels);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits