d023339c2f
This reverts commit7ce2a89f4f. Change-Id: I53f572777e84f66fd4c3d18fb686dac09095804a revertd38cb53e3bChange-Id: I5b243b69e50084316aaeab250d6b01079c12b718 Revert "sidebar: disable impress task pane if sidebar is enabled." This reverts commitee1726bfdb. revert54d820a781Change-Id: Ie7c83d88f5427a7e42fa50879280a0c4a7c2cdd1 Revert "Only register and use the Sidebar if it is globally enabled." This reverts commit66a5cc468c. Conflicts: sfx2/source/view/viewfrm.cxx Change-Id: I17fe702996c4adf7f387573d36ea993f8cc32c96 Revert "disable sidebar menu option if it is disabled." This reverts commit05f0eb5761. Revert "finally get the taskpane rendering again" This reverts commit228bb7ffe0. Conflicts: officecfg/registry/data/org/openoffice/Office/Impress.xcu sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx Change-Id: I248cc9a769695cde19e78774d42ce666dc685599 Revert "don't throw up the sidebar on start." This reverts commit645db9a2bd. Conflicts: officecfg/registry/data/org/openoffice/Office/Views.xcu Change-Id: I911859757e2e019836e8ed5213d2ba69ff82aec8 Revert "update to the right service name for new URLs." This reverts commit55f49970f4. Conflicts: sd/source/ui/framework/tools/FrameworkHelper.cxx Change-Id: I1ba2762a4c969a9125ff8354a9b6035813290021 Revert "tentatively restore more UNO / task-pane goo ..." This reverts commit052ac10a6f. Conflicts: officecfg/registry/data/org/openoffice/Office/Impress.xcu Change-Id: I7e62f27329af033df811549436718648a6447dea Revert "more reverts, first cut at making sidebar optional." This reverts commita65a423e22. Revert "add experimental option for sidebar to 'Advanced' pane." This reverts commit54d820a781. Conflicts: cui/source/options/optjava.cxx sd/source/ui/framework/module/ImpressModule.cxx Change-Id: I09a6c0f7834c8ef330d05a014505aaaf09ae096f Revert "Restore FrameworkHelper taskpane URLs." This reverts commite9c2d5b26b. more foo Change-Id: I2eaa2fbd74dc7a2f7ba937d310472cee6b5a0b57 really go to town on it Change-Id: I885dc03cd0286bbfdf05c05da9f0bbea2b78bcf4
47 lines
1.4 KiB
C++
47 lines
1.4 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#ifndef INCLUDED_SVTOOLS_RESTARTDIALOG_HXX
|
|
#define INCLUDED_SVTOOLS_RESTARTDIALOG_HXX
|
|
|
|
#include "sal/config.h"
|
|
|
|
#include "com/sun/star/uno/Reference.hxx"
|
|
#include "svtools/svtdllapi.h"
|
|
|
|
class Window;
|
|
namespace com { namespace sun { namespace star { namespace uno {
|
|
class XComponentContext;
|
|
} } } }
|
|
|
|
namespace svtools {
|
|
|
|
enum RestartReason {
|
|
RESTART_REASON_JAVA,
|
|
// "For the selected Java runtime environment to work properly,
|
|
// %PRODUCTNAME must be restarted."
|
|
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
|
|
// "For the bibliography to work properly,
|
|
// %PRODUCTNAME must be restarted."
|
|
};
|
|
|
|
// Must be called with the solar mutex locked:
|
|
SVT_DLLPUBLIC void executeRestartDialog(
|
|
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
|
|
const & context,
|
|
Window * parent, RestartReason reason);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|