cui/source/options/optjava.cxx | 5 +++++ include/svtools/restartdialog.hxx | 5 ++++- sd/source/ui/framework/factories/TaskPanelFactory.cxx | 1 - sfx2/source/dialog/taskpane.cxx | 18 +++++++++++------- svtools/source/dialogs/restartdialog.cxx | 3 +++ svtools/uiconfig/ui/restartdialog.ui | 16 +++++++++++++++- svx/source/dialog/frmdirlbox.cxx | 4 +++- svx/source/svdraw/svdundo.cxx | 10 ++++++++++ 8 files changed, 51 insertions(+), 11 deletions(-)
New commits: commit 30adf73871cacede1ade5615acc54288b07cd0be Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 31 12:29:43 2013 +0100 autosize the frame direction listbox Change-Id: I440ca0255a6079c28b2314b12511c6c41d6a05f5 (cherry picked from commit c799a1e5522971405fa45d3df7ebf259229df63e) diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 7de9437..ad1697d 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -56,7 +56,9 @@ FrameDirectionListBox::~FrameDirectionListBox() extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFrameDirectionListBox(Window *pParent, VclBuilder::stringmap &) { - return new FrameDirectionListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); + FrameDirectionListBox* pListBox = new FrameDirectionListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); + pListBox->EnableAutoSize(true); + return pListBox; } commit c40202a032c9f10161f46142c6960427522466fa Author: Caolán McNamara <caol...@redhat.com> Date: Thu May 30 20:00:46 2013 +0100 prompt to restart office when required for experimental features Change-Id: I43051ec6b0efeaebcf4a28940f70913423b8ea9f (cherry picked from commit 7ce2a89f4f8fa84232896766276cb3433ada239c) diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 1c03981..f7c8b17 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -627,6 +627,11 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetExperimentalSidebar( m_pExpSidebarCB->IsChecked() ); + + svtools::executeRestartDialog( + comphelper::getProcessComponentContext(), this, + svtools::RESTART_REASON_MODIFIED_SIDEBAR); + bModified = sal_True; } diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx index 993b099..d74d6d3 100644 --- a/include/svtools/restartdialog.hxx +++ b/include/svtools/restartdialog.hxx @@ -29,9 +29,12 @@ enum RestartReason { RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT, // For the modified default print job format to take effect, // %PRODUCTNAME must be restarted. - RESTART_REASON_BIBLIOGRAPHY_INSTALL + RESTART_REASON_BIBLIOGRAPHY_INSTALL, // "For the bibliography to work properly, // %PRODUCTNAME must be restarted." + RESTART_REASON_MODIFIED_SIDEBAR + // "For the sidebar to work properly, + // %PRODUCTNAME must be restarted." }; // Must be called with the solar mutex locked: diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index e5d64de..81655a5 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -40,6 +40,9 @@ public: case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL: get(reason_, "reason_bibliography_install"); break; + case svtools::RESTART_REASON_MODIFIED_SIDEBAR: + get(reason_, "reason_sidebar"); + break; default: assert(false); // this cannot happen } diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui index 5027620..f2445df 100644 --- a/svtools/uiconfig/ui/restartdialog.ui +++ b/svtools/uiconfig/ui/restartdialog.ui @@ -101,6 +101,20 @@ </packing> </child> <child> + <object class="GtkLabel" id="reason_sidebar"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">For the modified sidebar setting to take effect, %PRODUCTNAME must be restarted.</property> + <property name="wrap">True</property> + <property name="max_width_chars">50</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -110,7 +124,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> commit 2009cbb8515c99f8139f3e067e77823e2122cf71 Author: Caolán McNamara <caol...@redhat.com> Date: Thu May 30 17:27:59 2013 +0100 show experimental tab-layout only if in experimental mode Change-Id: I10cb366abfeedf50b4c3be21968997a260e020ea (cherry picked from commit dcb11907aee648fe2e382cdc16137d3fa469b530) diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index c7aa092..992f56d 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -44,6 +44,7 @@ #include <comphelper/types.hxx> #include <comphelper/processfactory.hxx> #include <tools/diagnose_ex.h> +#include <svtools/miscopt.hxx> #include <svtools/toolpanel/toolpaneldeck.hxx> #include <svtools/toolpanel/tablayouter.hxx> #include <svtools/toolpanel/drawerlayouter.hxx> @@ -1237,14 +1238,17 @@ namespace sfx2 } pMenu->InsertSeparator(); - #if OSL_DEBUG_LEVEL > 0 - pMenu->InsertItem( MID_LAYOUT_TABS, OUString("Tab-Layout (exp.)"), MIB_CHECKABLE ); - pMenu->CheckItem( MID_LAYOUT_TABS, impl_getLayout() != LAYOUT_DRAWERS ); - pMenu->InsertItem( MID_LAYOUT_DRAWERS, OUString("Drawer-Layout"), MIB_CHECKABLE ); - pMenu->CheckItem( MID_LAYOUT_DRAWERS, impl_getLayout() == LAYOUT_DRAWERS ); +#if OSL_DEBUG_LEVEL > 0 + if (SvtMiscOptions().IsExperimentalMode()) + { + pMenu->InsertItem( MID_LAYOUT_TABS, OUString("Tab-Layout (exp.)"), MIB_CHECKABLE ); + pMenu->CheckItem( MID_LAYOUT_TABS, impl_getLayout() != LAYOUT_DRAWERS ); + pMenu->InsertItem( MID_LAYOUT_DRAWERS, OUString("Drawer-Layout"), MIB_CHECKABLE ); + pMenu->CheckItem( MID_LAYOUT_DRAWERS, impl_getLayout() == LAYOUT_DRAWERS ); - pMenu->InsertSeparator(); - #endif + pMenu->InsertSeparator(); + } +#endif // Add entry for docking or un-docking the tool panel. if ( m_rDockingWindow.IsFloatingMode() ) commit 48245f6f61be33f1273b1c56a04daa0dbbd921b4 Author: Caolán McNamara <caol...@redhat.com> Date: Thu May 30 17:20:45 2013 +0100 drop stray SAL_DEBUG Change-Id: I7e67c7dc06388d95d8143f5419116bae4deb5e4b (cherry picked from commit 651d5fd5806b72117b73cf601a26ccc7dd468012) diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index 091c3f5..b53d9a3 100644 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -151,7 +151,6 @@ void SAL_CALL TaskPanelFactory::initialize( catch(RuntimeException&) {} - SAL_DEBUG( "TaskPanelFactory::initialize !" ); Reference<XControllerManager> xCM (xController, UNO_QUERY_THROW); Reference<XConfigurationController> xCC ( xCM->getConfigurationController(), UNO_QUERY_THROW); commit c328a18473e9b607e3f2536bec80451d720a3c23 Author: Armin Le Grand <a...@apache.org> Date: Thu May 30 13:09:07 2013 +0000 Resolves: #i122410# extended Undo/Redo for text to broadcast (cherry picked from commit d2c3483aa1c4fcce2678f9602d4204c908b4f874) Conflicts: svx/source/svdraw/svdundo.cxx Change-Id: If4e96f6c192d381324e12a3acea87f624ef194ea (cherry picked from commit 1de66ba440855050a794b3b2a8647c1b02c210b8) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 8209282..d5ca5e2 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1153,6 +1153,11 @@ void SdrUndoObjSetText::Undo() pObj->SetEmptyPresObj( bEmptyPresObj ); pObj->ActionChanged(); + + // #i122410# SetOutlinerParaObject at SdrText does not trigger a + // BroadcastObjectChange, but it is needed to make evtl. SlideSorters + // update their preview. + pObj->BroadcastObjectChange(); } void SdrUndoObjSetText::Redo() @@ -1166,6 +1171,11 @@ void SdrUndoObjSetText::Redo() } pObj->ActionChanged(); + // #i122410# NbcSetOutlinerParaObjectForText at SdrTextObj does not trigger a + // BroadcastObjectChange, but it is needed to make evtl. SlideSorters + // update their preview. + pObj->BroadcastObjectChange(); + // Trigger PageChangeCall ImpShowPageOfThisObject(); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits