cui/source/tabpages/tpline.cxx | 3 +-- sfx2/source/sidebar/PanelTitleBar.cxx | 4 +--- sfx2/source/sidebar/SidebarController.cxx | 11 +++++++++-- sfx2/source/sidebar/SidebarController.hxx | 1 + svx/source/xoutdev/xattr2.cxx | 3 +-- sw/source/ui/sidebar/PageSizeControl.cxx | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-)
New commits: commit e65bf3376ec742e2d5e69cad097d17f77fb19a73 Author: Andre Fischer <[email protected]> Date: Fri May 17 11:58:45 2013 +0000 122315: Include the Tools.hxx header always. diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 9c46e5e..4917412 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -29,14 +29,12 @@ #include "Panel.hxx" #include "sfx2/sidebar/Theme.hxx" #include "sfx2/sidebar/ControllerFactory.hxx" +#include "sfx2/sidebar/Tools.hxx" #include <tools/svborder.hxx> #include <vcl/gradient.hxx> #include <vcl/image.hxx> #include <toolkit/helper/vclunohelper.hxx> -#ifdef DEBUG -#include "sfx2/sidebar/Tools.hxx" -#endif using namespace css; using namespace cssu; commit b83fb522809c9b54427f60200164f878ae7f4658 Author: Oliver-Rainer Wittmann <[email protected]> Date: Fri May 17 11:35:46 2013 +0000 122310: page property panel, page size control - display page size as Width x Height diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx b/sw/source/ui/sidebar/PageSizeControl.cxx index c54f3ee..28b4908 100644 --- a/sw/source/ui/sidebar/PageSizeControl.cxx +++ b/sw/source/ui/sidebar/PageSizeControl.cxx @@ -116,9 +116,9 @@ PageSizeControl::PageSizeControl( maWidthHeightField.IsUseThousandSep(), maWidthHeightField.IsShowTrailingZeros() ); - ItemText2 = HeightStr; + ItemText2 = WidthStr; ItemText2 += String::CreateFromAscii(" x "); - ItemText2 += WidthStr; + ItemText2 += HeightStr; ItemText2 += String::CreateFromAscii(" "); ItemText2 += aMetricStr; commit a30912ea805a74f2ef47e10511d6e85ed4600b73 Author: Andre Fischer <[email protected]> Date: Fri May 17 11:13:52 2013 +0000 122082: React to changes read-only <-> read-write more realiably. diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 8e230c1..fd0a1af 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -93,6 +93,10 @@ namespace { MID_FIRST_PANEL, MID_FIRST_HIDE = 1000 }; + + /** When in doubt, show this deck. + */ + static const ::rtl::OUString gsDefaultDeckId(A2S("PropertyDeck")); } @@ -110,7 +114,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)), @@ -260,7 +264,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 dfa588c..e940974 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -163,6 +163,7 @@ private: /** Make maRequestedContext the current context. */ void UpdateConfigurations (void); + bool ArePanelSetsEqual ( const SharedPanelContainer& rCurrentPanels, const ResourceManager::PanelContextDescriptorContainer& rRequestedPanels); commit ee4c4e4fe15a3ec3af8e7d75cc314025793726c1 Author: Pavel JanÃk <[email protected]> Date: Fri May 17 10:18:30 2013 +0000 Use default case instead of handling a "meta" value. diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 5b8bb26..3aaadc9 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -223,8 +223,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres, nId = RID_SVXSTR_LINEJOINT_ROUND; break; - // Not handled? - case( com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE ): + default: break; } commit 0faa03061eb281510b885c7d39f2f0a3d2db10f2 Author: Pavel JanÃk <[email protected]> Date: Fri May 17 10:17:32 2013 +0000 Use default case instead of handling a "meta" value. diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e77de6e..bcc998c 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1344,8 +1344,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) case com::sun::star::drawing::LineJoint_NONE : maLBEdgeStyle.SelectEntryPos(1); break; case com::sun::star::drawing::LineJoint_MITER : maLBEdgeStyle.SelectEntryPos(2); break; case com::sun::star::drawing::LineJoint_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break; - // Not handled? - case com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE : break; + default: break; } } else
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
