[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 14 - sfx2/source/control/recentdocsview.cxx |9 ++-- sfx2/source/control/templatedefaultview.cxx|9 ++-- 3 files changed, 14 insertions(+), 18 deletions(-) New commits: commit 285a3e8d8b77b44da3dcc767877f878fe0e0493e Author: Heiko Tietze AuthorDate: Fri Nov 10 10:12:39 2023 +0100 Commit: Heiko Tietze CommitDate: Mon Nov 13 10:40:30 2023 +0100 Resolves tdf#158084 - Use system colors in start center StartCenterThumbnailsHighlightColor and StartCenterThumbnailsHighlightTextColor removed in favor of StyleSettings.GetHighlightColor and .GetActiveColor Change-Id: I7005b17f6c48525c791f23ea99b7b68e7a67531b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159286 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 76aa4e6c02d9..c551044a350d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3400,20 +3400,6 @@ 15658734 - - - -Specifies the background color of the highlight of a thumbnail in the start center. - - 14540253 - - - - -Specifies the text color of the highlight of a thumbnail in the start center. - - 3355443 - diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index cc2e80de17e9..055dc6962423 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -76,8 +76,13 @@ RecentDocsView::RecentDocsView(std::unique_ptr xWindow, st maFillColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); -maHighlightColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); -maHighlightTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get()); + +const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); +maHighlightColor = rSettings.GetHighlightColor(); +maHighlightTextColor = rSettings.GetHighlightTextColor(); +maSelectHighlightColor = rSettings.GetActiveColor(); +maSelectHighlightTextColor = rSettings.GetActiveTextColor(); + mfHighlightTransparence = 0.25; UpdateColors(); diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 17ad2ba7cbda..34d40875d23c 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -33,8 +33,13 @@ TemplateDefaultView::TemplateDefaultView(std::unique_ptr x // startcenter specific settings maFillColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); -maHighlightColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); -maHighlightTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get()); + +const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); +maHighlightColor = rSettings.GetHighlightColor(); +maHighlightTextColor = rSettings.GetHighlightTextColor(); +maSelectHighlightColor = rSettings.GetActiveColor(); +maSelectHighlightTextColor = rSettings.GetActiveTextColor(); + mfHighlightTransparence = 0.25; UpdateColors();
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |3 + officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 +++ sfx2/source/dialog/backingwindow.cxx | 21 - 3 files changed, 16 insertions(+), 13 deletions(-) New commits: commit 4af07053517ba3526d4050ffc29993a65b54352b Author: Venetia Furtado AuthorDate: Thu Aug 10 15:08:50 2023 -0600 Commit: Ilmari Lauhakangas CommitDate: Fri Nov 3 11:49:42 2023 +0100 tdf#140314:Use hub.libreoffice.org URL with params in Extensions Change-Id: Iccf76581de8dc44fe80aa818e9fb81c2cdf0967b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155571 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 23fa2f977764..ebfc18b4e005 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -372,6 +372,9 @@ ${PRIVACY_POLICY_URL} + + https://hub.libreoffice.org/extensions/ + diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index afa217c3bbd5..fcb8392436a9 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1880,6 +1880,11 @@ Specifies the URL for a privacy policy. + + + Specifies the URL used for Extensions box. + + diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 553577a846df..846fa2ffb70e 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,7 @@ #include #include +#include #include #include @@ -519,15 +521,10 @@ void BackingWindow::setOwningFrame( const css::uno::Reference< css::frame::XFram xFramesSupplier->setActiveFrame(mxFrame); } -IMPL_LINK(BackingWindow, ExtLinkClickHdl, weld::Button&, rButton, void) +IMPL_LINK(BackingWindow, ExtLinkClickHdl, weld::Button&, rButton,void) { -OUString aNode; - -if (&rButton == mxExtensionsButton.get()) -aNode = "AddFeatureURL"; - -if (aNode.isEmpty()) -return; +if (&rButton != mxExtensionsButton.get()) + return; try { @@ -540,11 +537,9 @@ IMPL_LINK(BackingWindow, ExtLinkClickHdl, weld::Button&, rButton, void) Reference xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS, args), UNO_QUERY); if (xNameAccess.is()) { -OUString sURL; -Any value(xNameAccess->getByName(aNode)); - -sURL = value.get(); -localizeWebserviceURI(sURL); +OUString sURL(officecfg::Office::Common::Menus::ExtensionsURL::get() + +"?LOvers=" + utl::ConfigManager::getProductVersion() + +"&LOlocale=" + LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() ); Reference const xSystemShellExecute(
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs |6 ++ sfx2/source/dialog/infobar.cxx |2 ++ 2 files changed, 8 insertions(+) New commits: commit 2d5e0e038f4e04ff7aa330e72d7358d5335a6f3a Author: Samuel Mehrbrodt AuthorDate: Mon Jan 30 14:59:06 2023 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Feb 2 08:38:40 2023 + Add missing macro infobar to isInfobarEnabled Change-Id: I7b9ddc0adfed2b7c27150d2d126f83e6a5ecf19d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146360 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs index 6b29f0b47e6a..6235c575c5d0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs @@ -60,6 +60,12 @@ true + + + Whether an Infobar is shown macros were blocked due to Macro Security settings. + +true + diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index aca75bffadd1..3eeb41b98e32 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -435,6 +435,8 @@ bool SfxInfoBarContainerWindow::isInfobarEnabled(std::u16string_view sId) return officecfg::Office::UI::Infobar::Enabled::WhatsNew::get(); if (sId == u"hiddentrackchanges") return officecfg::Office::UI::Infobar::Enabled::HiddenTrackChanges::get(); +if (sId == u"macro") +return officecfg::Office::UI::Infobar::Enabled::MacrosDisabled::get(); return true; }
[Libreoffice-commits] core.git: officecfg/registry sfx2/source sw/CppunitTest_sw_odfimport.mk sw/qa
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 125 sfx2/source/doc/docmacromode.cxx | 57 + sw/CppunitTest_sw_odfimport.mk |8 sw/qa/extras/odfimport/data/ZoneMacroTest.odt |binary sw/qa/extras/odfimport/odfimport.cxx | 130 + 5 files changed, 320 insertions(+) New commits: commit b22bbfa25ab1f0b9cfa1dedc85b8f9874f0a5e5b Author: Vasily Melenchuk AuthorDate: Mon Dec 5 20:32:41 2022 +0300 Commit: Thorsten Behrens CommitDate: Fri Dec 30 04:24:27 2022 + Related: tdf#125093 Check Windows Security Zones for macros In Windows, files get assigned security zones (local, from intranet, from internet, etc) after download via browser or email client. This is used by MS Word to decide in which mode it is safe to open file. This patch implements basic support for similar feature: by default there are no changes in macro behavior. But it is possible to use expert configuration options to tweak default behavior, and for example disable macros automatically, if a file is downloaded from Internet or other unsafe locations. Change-Id: I0bf1ae4e54d75dd5d07cab309124a67a85ef2d4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143680 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 023ed391bfe1..f333657151f5 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2814,6 +2814,131 @@ List with trusted authors. + + +Contains security settings regarding Basic scripts. + + + + Action needed for opening document with macro with Windows zone + identifier URLZONE_LOCAL_MACHINE (0, local machine). + + + + + Ask + + + + + Allow + + + + + Deny + + + +0 + + + + Action needed for opening document with macro with Windows zone + identifier URLZONE_INTRANET (1, local machine). + + + + + Ask + + + + + Allow + + + + + Deny + + + +0 + + + + Action needed for opening document with macro with Windows zone + identifier URLZONE_TRUSTED (2, trusted). + + + + + Ask + + + + + Allow + + + + + Deny + + + +0 + + + + Action needed for opening document with macro with Windows zone + identifier URLZONE_INTERNET (3, internet). + + + + + Ask + + + + + Allow + + + + + Deny + + + +0 + + + + Action needed for opening document with macro with Windows zone + identifier URLZONE_UNTRUSTED (3, untrusted source). + + + + + Ask + + + + + Allow + + + + + Deny + + + +0 + + diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index bdae350b22f5..cbd720132323 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -38,6 +38,10 @@ #include #include +#if defined(_WIN32) +#include +#include +#endif namespace sfx2 { @@ -284,6 +288,59 @@ namespace sfx2 } } +#if defined(_WIN32) +// Windows specific: try to decide macros loading depending on Windows Security Zones +
[Libreoffice-commits] core.git: officecfg/registry sfx2/source sfx2/uiconfig
officecfg/registry/data/org/openoffice/Office/Common.xcu |3 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 sfx2/source/dialog/backingwindow.cxx | 94 +++-- sfx2/source/dialog/backingwindow.hxx |5 sfx2/uiconfig/ui/startcenter.ui| 10 - 5 files changed, 97 insertions(+), 20 deletions(-) New commits: commit 35713de9d0b4981a019edd25591285d0bc6107db Author: Heiko Tietze AuthorDate: Tue Jan 19 14:37:19 2021 +0100 Commit: Heiko Tietze CommitDate: Tue Jan 26 14:43:06 2021 +0100 Make brand image clickable and link to LibreOffice volunteer page Change-Id: Ie422983d0e23faa16c2e2364b25798b938712a43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109637 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 83335726c843..237348be96cb 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -363,6 +363,9 @@ https://hub.libreoffice.org/InstallJava/ + + https://hub.libreoffice.org/volunteersupport/ + diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index de96a9477b37..be60d3d19ec3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2111,6 +2111,11 @@ Specifies the URL used with the UNO command SendFeedback (SID_SEND_FEEDBACK). + + + Specifies the URL opened per click on the brand image at the start center. + + Specifies the URL used with the UNO command QuestionAnswers (SID_Q_AND_A). diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 45aec2821c4d..01b29e4dc197 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,7 @@ #include #include #include +#include #include @@ -60,6 +62,73 @@ using namespace ::com::sun::star::document; constexpr OUStringLiteral SERVICENAME_CFGREADACCESS = u"com.sun.star.configuration.ConfigurationAccess"; +class BrandImage final : public weld::CustomWidgetController +{ +private: +BitmapEx maBrandImage; +bool mbIsDark = false; + +public: +virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override +{ +weld::CustomWidgetController::SetDrawingArea(pDrawingArea); +SetPointer(PointerStyle::RefHand); +} + +virtual void Resize() override +{ +auto nWidth = GetOutputSizePixel().Width(); +if (maBrandImage.GetSizePixel().Width() != nWidth) +LoadImageForWidth(nWidth); +weld::CustomWidgetController::Resize(); +} + +void LoadImageForWidth(int nWidth) +{ +mbIsDark = Application::GetSettings().GetStyleSettings().GetDialogColor().IsDark(); +SfxApplication::loadBrandSvg(mbIsDark ? "shell/logo-sc_inverted" : "shell/logo-sc", +maBrandImage, nWidth); +} + +void ConfigureForWidth(int nWidth) +{ +if (maBrandImage.GetSizePixel().Width() == nWidth) +return; +LoadImageForWidth(nWidth); +const Size aBmpSize(maBrandImage.GetSizePixel()); +set_size_request(aBmpSize.Width(), aBmpSize.Height()); +} + +virtual void StyleUpdated() override +{ +const bool bIsDark = Application::GetSettings().GetStyleSettings().GetDialogColor().IsDark(); +if (bIsDark != mbIsDark) +LoadImageForWidth(GetOutputSizePixel().Width()); +weld::CustomWidgetController::StyleUpdated(); +} + +virtual bool MouseButtonUp(const MouseEvent& rMEvt) override +{ +if (rMEvt.IsLeft()) +{ +OUString sURL = officecfg::Office::Common::Menus::VolunteerURL::get(); +localizeWebserviceURI(sURL); + +Reference const xSystemShellExecute( +css::system::SystemShellExecute::create( +::comphelper::getProcessComponentContext())); +xSystemShellExecute->execute(sURL, OUString(), + css::system::SystemShellExecuteFlags::URIS_ONLY); +} +return true; +} + +virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override +{ +rRenderContext.DrawBitmapEx(Point(0, 0), maBrandImage); +} +}; + // increase size of the text in the buttons on the left fMultiplier-times float const g_fMultiplier = 1.4f; @@ -77,7 +146,8 @@ BackingWindow::
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 14 --- sfx2/source/dialog/backingwindow.cxx | 16 - sfx2/source/dialog/backingwindow.hxx |1 3 files changed, 31 deletions(-) New commits: commit a927e0964ba0442d53fffb22c577e54bcf183ed7 Author: Jan-Marek Glogowski AuthorDate: Sat Sep 19 20:53:34 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Wed Oct 7 04:12:36 2020 +0200 tdf#136555 drop custom start center button colors Custom button text or background colors don't play nice with any complex theming. Maybe we should still allow a custom background color for the button bar, but probably that attempt is also futile and clashes with theming easily. As long as the botton bar uses themable push-buttons as a control custom coloring will break at some point, as these buttons can have too many states, which curently depend on the theme. There is no way for LO to know, if a roll-over button will return with a different backround or just some changed border from a themed paint call. So this reverts the button part of tdf#90452. It doesn't affect the preview area, as that is a custom widget, which doesn't use any theming, but has it's own setting - for better or worse. Change-Id: I1ef17a50d15a5876a11bce89ae3f764aa91f66bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103041 Tested-by: Jenkins Tested-by: Heiko Tietze Reviewed-by: Heiko Tietze Reviewed-by: Jan-Marek Glogowski diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index f764d3d7aa45..b5bcb9c8bde0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3699,20 +3699,6 @@ - - - -Specifies the background color of the start center. - - 14540253 - - - - -Specifies the text color of the buttons in the start center. - - 3355443 - diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index ead00a2beeb9..48bb6c1cf416 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -68,7 +68,6 @@ float const fMultiplier = 1.4f; BackingWindow::BackingWindow( vcl::Window* i_pParent ) : Window( i_pParent ), mbLocalViewInitialized(false), - maButtonsTextColor(Color(officecfg::Office::Common::Help::StartCenter::StartCenterTextColor::get())), mbInitControls( false ) { m_pUIBuilder.reset(new VclBuilder(this, AllSettings::GetUIRootDir(), "sfx/ui/startcenter.ui", "StartCenter" )); @@ -255,19 +254,10 @@ void BackingWindow::initControls() mpExtensionsButton->SetClickHdl(LINK(this, BackingWindow, ExtLinkClickHdl)); // setup nice colors -mpCreateLabel->SetControlForeground(maButtonsTextColor); vcl::Font aFont(mpCreateLabel->GetSettings().GetStyleSettings().GetLabelFont()); aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier)); mpCreateLabel->SetControlFont(aFont); -mpHelpButton->SetControlForeground(maButtonsTextColor); -mpExtensionsButton->SetControlForeground(maButtonsTextColor); - -const Color aButtonsBackground(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get()); - -mpAllButtonsBox->SetBackground(aButtonsBackground); -mpSmallButtonsBox->SetBackground(aButtonsBackground); - // motif image under the buttons Wallpaper aWallpaper(get("motif")->GetImage().GetBitmapEx()); aWallpaper.SetStyle(WallpaperStyle::BottomRight); @@ -307,9 +297,6 @@ void BackingWindow::setupButton( PushButton* pButton ) vcl::Font aFont(pButton->GetSettings().GetStyleSettings().GetPushButtonFont()); aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier)); pButton->SetControlFont(aFont); - -// color that fits the theme -pButton->SetControlForeground(maButtonsTextColor); pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) ); } @@ -319,9 +306,6 @@ void BackingWindow::setupButton( MenuToggleButton* pButton ) aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier)); pButton->SetControlFont(aFont); -// color that fits the theme -pButton->SetControlForeground(maButtonsTextColor); - PopupMenu* pMenu = pButton->GetPopupMenu(); pMenu->SetMenuFlags(pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries); diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 15ab2fe0728f..99d7bd6b7ccc 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -78,7 +78,6 @@
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs |6 + sfx2/source/dialog/infobar.cxx |2 sfx2/source/view/viewfrm.cxx | 35 -- 3 files changed, 23 insertions(+), 20 deletions(-) New commits: commit 1dcbf68bfabe1436f5a3f54f902d18de06895dbb Author: Heiko Tietze AuthorDate: Fri Oct 2 13:39:12 2020 +0200 Commit: Heiko Tietze CommitDate: Mon Oct 5 12:05:00 2020 +0200 Disable WhatsNew infobar with standard method WhatsNew IB uses the Newly introduced Enabled property now IsReadOnly got removed Follow-up to 3fb1477de164bba260e3e9a39afcb3f67c78fb5e Change-Id: I3989acf835ee219575106bc6c7d5edac4e6accd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103841 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs index af0434046770..a7f996dc4ed8 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs @@ -48,6 +48,12 @@ true + + + Whether an Infobar is shown when the major version number has changed + +true + diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 580bd6685801..1b48cf758212 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -439,6 +439,8 @@ bool SfxInfoBarContainerWindow::isInfobarEnabled(const OUString& sId) return officecfg::Office::UI::Infobar::Enabled::GetInvolved::get(); if (sId == "hyphenationmissing") return officecfg::Office::UI::Infobar::Enabled::HyphenationMissing::get(); +if (sId == "whatsnew") +return officecfg::Office::UI::Infobar::Enabled::WhatsNew::get(); return true; } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 6dc772e0c06e..76b8db3754b5 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1325,29 +1325,24 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } //what's new infobar -if (!officecfg::Setup::Product::ooSetupLastVersion::isReadOnly()) //don't show/update when readonly +OUString sSetupVersion = utl::ConfigManager::getProductVersion(); +sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32(); +OUString sLastVersion += officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0"); +sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() * 10 + sLastVersion.getToken(1,'.').toInt32(); +if ((iCurrent > iLast) && !Application::IsHeadlessModeEnabled() && !bIsUITest) { -OUString sSetupVersion = utl::ConfigManager::getProductVersion(); -sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32(); -OUString sLastVersion -= officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0"); -sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() * 10 + sLastVersion.getToken(1,'.').toInt32(); -if ((iCurrent > iLast) && !Application::IsHeadlessModeEnabled() && !bIsUITest) +VclPtr pInfoBar = AppendInfoBar("whatsnew", "", SfxResId(STR_WHATSNEW_TEXT), InfobarType::INFO); +if (pInfoBar) { -VclPtr pInfoBar = AppendInfoBar("whatsnew", "", SfxResId(STR_WHATSNEW_TEXT), InfobarType::INFO); -if (pInfoBar) -{ -weld::Button& rWhatsNewButton = pInfoBar->addButton(); - rWhatsNewButton.set_label(SfxResId(STR_WHATSNEW_BUTTON)); -rWhatsNewButton.connect_clicked(LINK(this, SfxViewFrame, WhatsNewHandler)); - -//update lastversion -std::shared_ptr batch(comphelper::ConfigurationChanges::create()); -officecfg::Setup::Product::ooSetupLastVersion::set( -sSetupVersion, batch); -batch->commit(); -} +weld::Button& rWhatsNewButton = pInfoBar->addButton(); + rWhatsNewButton.set_label(SfxResId(STR_WHATSNEW_BUTTON)); +rWhatsNewButton.connect_clicked(LINK(this, SfxViewFrame, WhatsNewHandler)); } +//update lastversion +
[Libreoffice-commits] core.git: officecfg/registry sfx2/source sw/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |3 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 + sfx2/source/appl/appserv.cxx | 29 sw/source/uibase/app/apphdl.cxx| 45 - 4 files changed, 56 insertions(+), 27 deletions(-) New commits: commit f62e4fb51d72641896b6b8f38fbffb35e6c1b695 Author: Rene Engelhard AuthorDate: Mon Feb 3 19:26:56 2020 +0100 Commit: Mike Kaganski CommitDate: Tue Feb 11 18:33:33 2020 +0100 make Base install via packagekit also confgurable (like fonts/langpacks) Change-Id: I72f98e89d1c8e92f10da8e3843956658d035528d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87907 Tested-by: Rene Engelhard Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 5f99ddc036bd..3d138551b593 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -556,6 +556,9 @@ true + +true + diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 87839ae3cd9d..b217416756da 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6621,6 +6621,12 @@ true + + + Specifies if missing LibreOffice Base installation should be triggered. + +true + diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index aee61e671f14..459d482cbf68 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -174,20 +174,23 @@ namespace // make sure we actually can instantiate services from base first if(!lcl_isBaseAvailable()) { -try -{ -using namespace org::freedesktop::PackageKit; -using namespace svtools; -Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); -Sequence< OUString > vPackages { "libreoffice-base" }; -xSyncDbusSessionHelper->InstallPackageNames(vPackages, OUString()); -// Ill be back (hopefully)! -SolarMutexGuard aGuard; -executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, RESTART_REASON_BIBLIOGRAPHY_INSTALL); -} -catch (const Exception &) +if (officecfg::Office::Common::PackageKit::EnableBaseInstallation::get()) { -TOOLS_INFO_EXCEPTION("sfx.appl", "trying to install LibreOffice Base"); +try +{ +using namespace org::freedesktop::PackageKit; +using namespace svtools; +Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); +Sequence< OUString > vPackages { "libreoffice-base" }; +xSyncDbusSessionHelper->InstallPackageNames(vPackages, OUString()); +// I'll be back (hopefully)! +SolarMutexGuard aGuard; + executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, RESTART_REASON_BIBLIOGRAPHY_INSTALL); +} +catch (const Exception &) +{ +TOOLS_INFO_EXCEPTION("sfx.appl", "trying to install LibreOffice Base"); +} } return; } diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 073b9d4a911a..aa8111004ab4 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -80,6 +80,8 @@ #include #include +#include + using namespace ::com::sun::star; // Slotmaps for the application's methods @@ -414,21 +416,36 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs { if(!lcl_hasAllComponentsAvailable()) { -try -{ -using namespace org::freedesktop::PackageKit; -using namespace svtools; -css::uno::Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); -const css::uno::Sequence< OUString > vPackages{ "libreoffice-base" }; -xSyncDbusSessionHelper->InstallPackageNames(vPackages, OUString()); -SolarMutexGuard aGuard; -executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, RESTART_REASON_M
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 ++ sfx2/source/doc/objstor.cxx|4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit c161478ed50f6ee8878335db113f8850a136615b Author: Samuel Mehrbrodt AuthorDate: Tue Feb 4 10:36:09 2020 +0100 Commit: Thorsten Behrens CommitDate: Tue Feb 4 22:19:41 2020 +0100 Allow opt-out from document events check Commit b3edf85e0fe6ca03dc26e1bf531be82193bc9627 added a warning on load when a document binds events to a macro. This adds an option to restore the old behavior, so that the warning only appears when a document actually has Macros. Change-Id: I5ad398d3d503a0954a746f4cba150f68630b820c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87961 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index dbe38f526f05..0a880488324d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2728,6 +2728,12 @@ false + + +Warn on load when a document binds an event to a macro + + true + List with trusted authors. diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 5b7eb70d946a..56b8fdde8e0a 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3583,7 +3583,9 @@ void SfxObjectShell::SetMacroCallsSeenWhileLoading() bool SfxObjectShell::GetMacroCallsSeenWhileLoading() const { -return pImpl->m_bMacroCallsSeenWhileLoading; +if (officecfg::Office::Common::Security::Scripting::CheckDocumentEvents::get()) +return pImpl->m_bMacroCallsSeenWhileLoading; +return false; } bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference< task::XInteractionHandler >& xHandler ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source sw/inc sw/sdi sw/source sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 sfx2/source/control/unoctitm.cxx |1 sw/inc/cmdid.h |1 sw/sdi/_annotsh.sdi |6 +++ sw/sdi/_textsh.sdi |5 ++ sw/sdi/swriter.sdi | 17 ++ sw/source/uibase/docvw/AnnotationMenuButton.cxx |6 +++ sw/source/uibase/docvw/AnnotationWin2.cxx|8 sw/source/uibase/shells/annotsh.cxx | 16 - sw/source/uibase/shells/textfld.cxx |9 + sw/uiconfig/sglobal/menubar/menubar.xml |1 sw/uiconfig/sglobal/popupmenu/annotation.xml |1 sw/uiconfig/swriter/menubar/menubar.xml |1 sw/uiconfig/swriter/popupmenu/annotation.xml |1 sw/uiconfig/swriter/ui/annotationmenu.ui | 16 + sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui|7 16 files changed, 102 insertions(+), 2 deletions(-) New commits: commit 6986ebd4a0020e515a115acbe7f1f738a4fd83f4 Author: Scott Clarke AuthorDate: Wed Jun 19 16:29:54 2019 +0100 Commit: Miklos Vajna CommitDate: Wed Aug 7 09:44:10 2019 +0200 tdf#119228 Add UI elements to resolve and unresolve comments Change-Id: I22403299d034a638724077744070b3add64cacf2 Co-authored-by: Jim MacArthur Reviewed-on: https://gerrit.libreoffice.org/75861 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index d3f803d91024..0dd6c5173768 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -6352,6 +6352,14 @@ 1 + + + Resolved + + + 1 + + Top diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index a321248cdc9b..9588ff61d551 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1058,6 +1058,7 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c aEvent.FeatureURL.Path == "SelectAll" || aEvent.FeatureURL.Path == "InsertAnnotation" || aEvent.FeatureURL.Path == "DeleteAnnotation" || + aEvent.FeatureURL.Path == "ResolveAnnotation" || aEvent.FeatureURL.Path == "InsertRowsBefore" || aEvent.FeatureURL.Path == "InsertRowsAfter" || aEvent.FeatureURL.Path == "InsertColumnsBefore" || diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index e442239e8fd2..e45451022819 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -729,6 +729,7 @@ #define FN_DELETE_COMMENT (FN_NOTES+6) #define FN_REPLY(FN_NOTES+7) #define FN_FORMAT_ALL_NOTES (FN_NOTES+8) +#define FN_RESOLVE_NOTE (FN_NOTES+9) // Region: Parameter #define FN_PARAM_MOVE_COUNT (FN_PARAM+2) diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi index 323d5d06b8b1..84f3aed0b007 100644 --- a/sw/sdi/_annotsh.sdi +++ b/sw/sdi/_annotsh.sdi @@ -60,6 +60,12 @@ interface _Annotation StateMethod = GetNoteState ; ] +FN_RESOLVE_NOTE +[ +ExecMethod = NoteExec ; +StateMethod = GetNoteState ; +] + FN_POSTIT [ ExecMethod = NoteExec ; diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index 9abad60e8197..3d7bbd56b32e 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -957,6 +957,11 @@ interface BaseText ExecMethod = ExecField ; StateMethod = StateField; ] +FN_RESOLVE_NOTE +[ +ExecMethod = ExecField ; +StateMethod = StateField; +] FN_DELETE_NOTE_AUTHOR [ ExecMethod = ExecField ; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 02bdbd961d4c..bb5d67ce161b 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -7066,6 +7066,23 @@ SfxVoidItem DeleteComment FN_DELETE_COMMENT GroupId = SfxGroupId::Edit; ] +SfxVoidItem ResolveComment FN_RESOLVE_NOTE +(SvxPostItIdItem Id SID_ATTR_POSTIT_ID) +[ +AutoUpdate = FALSE, +FastCall = FALSE, +ReadOnlyDoc = FALSE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; + +AccelConfig = TRUE, +MenuConfig = TRUE, +ToolBoxConfig = TRUE, +GroupId = SfxGroupId::Edit; +] + SfxStringItem DeleteAuthor
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +++ sfx2/source/doc/docfile.cxx| 15 + 2 files changed, 24 insertions(+) New commits: commit 297be63c8d1dd8f802b5216048d860c5b2661edc Author: Katarina Behrens AuthorDate: Tue Nov 27 15:30:24 2018 +0100 Commit: Thorsten Behrens CommitDate: Sat Dec 1 03:08:36 2018 +0100 Option to turn off WebDAV file locking Locking files on WebDAV shares was implemented in tdf#82744, in particular: commit 26e6d4b05ab444e6a7529ffcac7fbe592fc94833 tdf#82744: fix WebDAV lock/unlock behaviour - part 1 commit bc9a8ddbb7081f79e915c841e56fd1c40f0df6f9 tdf#82744: fix WebDAV lock/unlock behaviour - part 2 commit b4576f3da4d90139fc5140962d13cb91dab98797 tdf#82744: fix WebDAV lock/unlock behaviour - part 3 commit fed2984281a85a5a2f308841ec810f218c75f2ab tdf#82744: fix WebDAV lock/unlock behaviour - part 4 Before that, files on WebDAV shares were accessed w/o locking since the beginning of [OOo] time. This option allows to revert to the old behaviour i.e. non-locking WebDAV access. For concurrent read-write WebDAV access by multiple users it is recommended to keep UseWebDAVFileLocking at default value (true) Change-Id: Id92177631d4854d6c7bf412164acbd9740db9592 Reviewed-on: https://gerrit.libreoffice.org/64116 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 225567c53a06..6e7869bb8bf7 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5356,6 +5356,15 @@ true + + + Determines if WebDAV-specific file locking is used for documents + on WebDAV shares. It is not recommended to set this option to 'false' in + scenarios where multi-user, concurrent read/write access to WebDAV share + is required + +true + Allows to specify whether the OOo document file locking diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 144fe50aa64c..f232cc0d2ba8 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -173,6 +173,11 @@ bool IsLockingUsed() #endif +bool IsWebDAVLockingUsed() +{ +return officecfg::Office::Common::Misc::UseWebDAVFileLocking::get(); +} + /// Gets default attributes of a file:// URL. sal_uInt64 GetDefaultFileAttributes(const OUString& rURL) { @@ -1088,6 +1093,10 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b if ( GetURLObject().isAnyKnownWebDAVScheme() ) { +// do nothing if WebDAV locking is disabled +if (!IsWebDAVLockingUsed()) +return LockFileResult::Succeeded; + try { bool bResult = pImpl->m_bLocked; @@ -2866,6 +2875,12 @@ void SfxMedium::UnlockFile( bool bReleaseLockStream ) // check if webdav if ( GetURLObject().isAnyKnownWebDAVScheme() ) { +// do nothing if WebDAV locking if disabled +// (shouldn't happen because we already skipped locking, +// see LockOrigFileOnDemand, but just in case ...) +if (!IsWebDAVLockingUsed()) +return; + if ( pImpl->m_bLocked ) { // an interaction handler should be used for authentication, if needed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/data/org/openoffice/Office/Common.xcu | 15 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs | 25 + sfx2/source/appl/appserv.cxx | 18 ++--- 3 files changed, 52 insertions(+), 6 deletions(-) New commits: commit b2fdf08169fea536bc05e49bf63d70d6fdbfe31b Author: heiko tietze AuthorDate: Wed Oct 17 11:39:25 2018 +0200 Commit: Heiko Tietze CommitDate: Thu Oct 18 20:16:23 2018 +0200 tdf#113415 - Customizable links in Help menu SendFeedbackURL, QA_URL, DocumentationURL, GetInvolvedURL, DonationURL added to global variables under Menus Change-Id: Ie95ef2795d4079edd204edb1fcd86fde4376cedf Reviewed-on: https://gerrit.libreoffice.org/61874 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 5575bbd3d350..9ef049838ffb 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -379,6 +379,21 @@ + + https://hub.libreoffice.org/send-feedback/ + + + https://hub.libreoffice.org/forum/ + + + https://hub.libreoffice.org/documentation/ + + + https://hub.libreoffice.org/joinus/ + + + https://hub.libreoffice.org/donation/ + diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 4525662ec5ae..4ef848e68b0c 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2049,6 +2049,31 @@ Contains all help bookmarks. + + + Specifies the URL used with the UNO command SendFeedback (SID_SEND_FEEDBACK). + + + + + Specifies the URL used with the UNO command QuestionAnswers (SID_Q_AND_A). + + + + + Specifies the URL used with the UNO command Documentation (SID_DOCUMENTATION). + + + + + Specifies the URL used with the UNO command GetInvolved (SID_GETINVOLVED). + + + + + Specifies the URL used with the UNO command Donation (SID_DONATION). + + diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 81b905c91455..58ec3d6506d8 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -527,8 +527,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_SEND_FEEDBACK: { OUString module = SfxHelp::GetCurrentModuleIdentifier(); -OUString sURL("https://hub.libreoffice.org/send-feedback/?LOversion="; + utl::ConfigManager::getAboutBoxProductVersion() + -"&LOlocale=" + utl::ConfigManager::getUILocale() + "&LOmodule=" + module.copy(module.lastIndexOf('.') + 1 ) ); +OUString sURL(officecfg::Office::Common::Menus::SendFeedbackURL::get() + //officecfg/registry/data/org/openoffice/Office/Common.xcu => https://hub.libreoffice.org/send-feedback/ +"?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + +"&LOlocale=" + utl::ConfigManager::getUILocale() + +"&LOmodule=" + module.copy(module.lastIndexOf('.') + 1 ) ); sfx2::openUriExternally(sURL, false); break; } @@ -538,21 +540,24 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) // Askbot has URL's normalized to languages, not locales // Get language from locale: ll or lll or ll-CC or lll-CC -OUString sURL("https://hub.libreoffice.org/forum/?LOlocale="; + utl::ConfigManager::getUILocale()); +OUString sURL(officecfg::Office::Common::Menus::QA_URL::get() + //https://hub.libreoffice.org/forum/ +"?LOlocale=" + utl::ConfigManager::getUILocale()); sfx2::openUriExternally(sURL, false); break; } case SID_DOCUMENTATION: { // Open documentation page based on locales -OUString sURL("https://hub.libreoffice.org/documentation/?LOlocale="; + utl::ConfigManager::getUILocale()); +OUString sURL(officecfg::Office::Common::Menus::DocumentationURL::get() + //https://hub.libreoffice.org/documentation/ +"?LOlocale=" + utl::ConfigManager::getUILocale()); sfx2::openUriExternally(sURL, false); break; } case SID_GETINVOLVED: { // Open get involved/join us page based on locales -OUString sURL("https://hub.libreoffice.org/joinus/?LOlocale="; + utl::ConfigManager::getUILocale()); +OUString sURL(off
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |5 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 11 sfx2/source/view/classificationcontroller.cxx | 206 - 3 files changed, 95 insertions(+), 127 deletions(-) New commits: commit 3e493d337819204ca9c7302efbd7b34c282956a2 Author: Tomaž Vajngerl Date: Fri Aug 4 16:10:43 2017 +0200 TSCP: simplify toolbar to only one combo box + configuration Previously we had 3 comboboxes each for different classification policies. This simplifies it to just use one classification policy and which policy it will be used can be set in LO configuration. By default this is the "IntellectualProperty" policy, which is the one most users will probably be interested in. Change-Id: I1fc69c2123b04ecf58a6775e5bcda3b5316414a3 Reviewed-on: https://gerrit.libreoffice.org/40768 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index f84bd1a8eeb6..746553f17dd7 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -542,4 +542,9 @@ true + + +3 + + diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index bbf4f4eea7d1..0793ee4e6ad9 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6729,5 +6729,16 @@ true + + +TSCP Classification + + + + The policy type used at classification + +3 + + diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index b122fb669d92..93cbee5e8193 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -29,6 +29,8 @@ #include #include +#include + using namespace com::sun::star; namespace sfx2 @@ -58,7 +60,7 @@ class ClassificationCategoriesController : public ClassificationCategoriesContro rtl::Reference m_xListener; ClassificationPropertyListener m_aPropertyListener; -DECL_LINK(SelectHdl, ListBox&, void); +DECL_STATIC_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, void); public: explicit ClassificationCategoriesController(const uno::Reference& rContext); @@ -83,8 +85,8 @@ public: /// Classification control is the parent of all widgets that belongs to ClassificationCategoriesController. class SAL_WARN_UNUSED ClassificationControl : public vcl::Window { -std::map> m_pLabels; -std::map> m_pCategories; +VclPtr m_pLabel; +VclPtr m_pCategory; void SetOptimalSize(); void DataChanged(const DataChangedEvent& rEvent) override; @@ -93,11 +95,29 @@ public: ~ClassificationControl() override; void dispose() override; void Resize() override; -const VclPtr& getCategories(SfxClassificationPolicyType eType); -std::size_t getLabelsSize(); -OUString getCategoryType(ListBox& rCategory); +const VclPtr& getCategory() +{ +return m_pCategory; +} }; +namespace +{ + +SfxClassificationPolicyType getPolicyType() +{ +sal_Int32 nPolicyTypeNumber = officecfg::Office::Common::Classification::Policy::get(); +auto eType = static_cast(nPolicyTypeNumber); +return eType; +} + +OUString getCategoryType() +{ +return SfxClassificationHelper::policyTypeToString(getPolicyType()); +} + +} // end anonymous namespace + ClassificationPropertyListener::ClassificationPropertyListener(const rtl::Reference& xListener, ClassificationCategoriesController& rController) : ClassificationPropertyListenerBase(xListener, "WritePath") , m_rController(rController) @@ -131,11 +151,7 @@ sal_Bool ClassificationCategoriesController::supportsService(const OUString& rSe uno::Sequence ClassificationCategoriesController::getSupportedServiceNames() { -uno::Sequence aServices -{ -"com.sun.star.frame.ToolbarController" -}; -return aServices; +return { "com.sun.star.frame.ToolbarController" }; } void ClassificationCategoriesController::dispose() @@ -155,23 +171,18 @@ uno::Reference ClassificationCategoriesController::createItemWindo if (pToolbar) { m_pClassification = VclPtr::Create(pToolbar); -for (size_t i = m_pClassification->getLabelsSize(); i > 0; --i) -{ -auto eType = static_cast(i); -m_pClassification->getCategories(eType)->SetSelectHdl(LINK(this, ClassificationCategoriesController, SelectHdl)); -} +m_pClassification->getCategory()->SetSelectHdl(LINK(this, ClassificationCategoriesController, SelectHdl));
[Libreoffice-commits] core.git: officecfg/registry sfx2/source sfx2/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 ++-- sfx2/source/doc/templatedlg.cxx |4 ++-- sfx2/uiconfig/ui/templatedlg.ui |2 +- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit a308454241487971a773a8c4d55106b1907ac793 Author: Samuel Mehrbrodt Date: Fri Apr 29 13:05:08 2016 + Template Manager -> Templates As agreed in the design team. Most places already use "Templates". Change-Id: I6186546883059bf0308fabd61b162eb649647ec9 Reviewed-on: https://gerrit.libreoffice.org/24493 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 1c848eb..52fc8f1 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -6016,7 +6016,7 @@ - Template Manager + Templates diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index caaa20a..10461b5f 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5769,12 +5769,12 @@ - List of template repositories URLs bookmarked in the template manager dialog. + List of template repositories URLs bookmarked in the Templates dialog. - List of template repositories names bookmarked in the template manager dialog. + List of template repositories names bookmarked in the Templates dialog. diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 2b4f9b3..d1a5268 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -290,7 +290,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) createRepositoryMenu(); createDefaultTemplateMenu(); -//setSaveMode(); //Uncomment this line to put template manager into Save As mode +//setSaveMode(); //Uncomment this line to put templates dialog into Save As mode mpLocalView->Populate(); mpCurView->filterItems(ViewFilter_Application(FILTER_APPLICATION::WRITER)); @@ -352,7 +352,7 @@ void SfxTemplateManagerDlg::setSaveMode() // only with .src dialogs, as the tab pages could have existed even // without TabControl containing them. This is not possible with .ui // definitions any more (and rightly so!), so leave just one tab here for -// now, until we do a bigger Template manager rework. +// now, until we do a bigger rework of the templates dialog. while (mpTabControl->GetPageCount() > 1) mpTabControl->RemovePage(mpTabControl->GetPageId(1)); diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui index 0517ea3..858a546 100644 --- a/sfx2/uiconfig/ui/templatedlg.ui +++ b/sfx2/uiconfig/ui/templatedlg.ui @@ -8,7 +8,7 @@ 600 False 6 -Template Manager +Templates True normal ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 12 sfx2/source/view/classificationhelper.cxx |6 -- 2 files changed, 16 insertions(+), 2 deletions(-) New commits: commit 9bd334a475e24d8454ef51b4d9aa5bd7668ee58e Author: Miklos Vajna Date: Tue Mar 1 17:55:43 2016 +0100 sfx2 classification: don't hardcode the policy path This moves the path from code to configuration, UI is still missing to actually edit that configuration key though. Change-Id: Ie9e9fa986544c8df99203b7f50f19f886ad64009 Reviewed-on: https://gerrit.libreoffice.org/22817 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index e06114e..9ce22f1 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1580,6 +1580,12 @@ $(insturl)/@LIBO_SHARE_FOLDER@/config/symbol + + +Contains the URL of the current TSCP BAF policy file. + + $BRAND_BASE_DIR/@LIBO_SHARE_FOLDER@/classification/example.xml + Contains the configuration files. This value cannot be changed @@ -1775,6 +1781,12 @@ $(insturl)/@LIBO_SHARE_FOLDER@/config/symbol + + +Contains the URL of the default TSCP BAF policy file. + + $BRAND_BASE_DIR/@LIBO_SHARE_FOLDER@/classification/example.xml + Specifies the default directory where the configuration files diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index 8fc5190..cade650 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include using namespace com::sun::star; @@ -309,14 +310,15 @@ SfxClassificationHelper::Impl::Impl(SfxObjectShell& rObjectShell) void SfxClassificationHelper::Impl::parsePolicy() { -OUString aPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/classification/example.xml"); +uno::Reference xComponentContext = comphelper::getProcessComponentContext(); +OUString aPath = officecfg::Office::Common::Path::Current::Classification::get(xComponentContext); rtl::Bootstrap::expandMacros(aPath); SvStream* pStream = utl::UcbStreamHelper::CreateStream(aPath, StreamMode::READ); uno::Reference xInputStream(new utl::OStreamWrapper(*pStream)); xml::sax::InputSource aParserInput; aParserInput.aInputStream = xInputStream; -uno::Reference xParser = xml::sax::Parser::create(comphelper::getProcessComponentContext()); +uno::Reference xParser = xml::sax::Parser::create(xComponentContext); rtl::Reference xClassificationParser(new SfxClassificationParser()); uno::Reference xHandler(xClassificationParser.get()); xParser->setDocumentHandler(xHandler); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +++ sfx2/source/appl/sfxpicklist.cxx |5 - sfx2/source/control/recentdocsview.cxx |3 ++- sfx2/source/control/recentdocsviewitem.cxx |5 - 4 files changed, 17 insertions(+), 3 deletions(-) New commits: commit 1a032dcfebc2702f0612c470d6b9c3e3cf4fb637 Author: Pierre Sauter Date: Tue Dec 1 17:28:48 2015 + tdf#74834 Expert Configuration option to disable thumbnails in StartCenter If Office::Common::History::RecentDocsThumbnail is set to false, no new thumbnails will be created and stored to registrymodifications.xcu. Existing thumbnails in registrymodifications.xcu or the documents will not be read and displayed. Change-Id: If9527aa0d336a6b77b4c9bb0cc09143ffa1725d8 Reviewed-on: https://gerrit.libreoffice.org/20338 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 7279a04..b8d9828 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2079,6 +2079,13 @@ 25 + + + Specifies whether to generate/show a thumbnail image for RecentDocsView. + Store/show thumbnails in RecentDocs History + +true + Contains the most recently opened help documents. diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 9e9b164..6e07c1b 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -200,7 +201,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) boost::optional aThumbnail; // generate the thumbnail -if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled()) +//fdo#74834: only generate thumbnail for history if the corresponding option is not disabled in the configuration +if (!pDocSh->IsModified() && !Application::IsHeadlessModeEnabled() && +officecfg::Office::Common::History::RecentDocsThumbnail::get()) { // not modified => the document matches what is in the shell const SfxUnoAnyItem* pEncryptionDataItem = SfxItemSet::GetItem(pMed->GetItemSet(), SID_ENCRYPTIONDATA, false); diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index e4f5932..55f1c07 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -182,7 +182,8 @@ void RecentDocsView::Reload() a >>= aURL; else if (rRecentEntry[j].Name == "Title") a >>= aTitle; -else if (rRecentEntry[j].Name == "Thumbnail") +//fdo#74834: only load thumbnail if the corresponding option is not disabled in the configuration +else if (rRecentEntry[j].Name == "Thumbnail" && officecfg::Office::Common::History::RecentDocsThumbnail::get()) { OUString aBase64; a >>= aBase64; diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index ea5169f..abf4325 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,9 @@ RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rUR aTitle = aURLObj.GetName(INetURLObject::DECODE_WITH_CHARSET); BitmapEx aThumbnail(rThumbnail); -if (aThumbnail.IsEmpty() && aURLObj.GetProtocol() == INetProtocol::File) +//fdo#74834: only load thumbnail if the corresponding option is not disabled in the configuration +if (aThumbnail.IsEmpty() && aURLObj.GetProtocol() == INetProtocol::File && +officecfg::Office::Common::History::RecentDocsThumbnail::get()) aThumbnail = ThumbnailView::readThumbnail(rURL); if (aThumbnail.IsEmpty()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 - sfx2/source/dialog/backingwindow.cxx |5 - 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 895efd4f399fd717343bbc1ba3538fa01cf0a40a Author: Andras Timar Date: Mon Aug 25 20:50:27 2014 +0200 make background color of startcenter configurable Change-Id: Ice6a92186d641e9446b9d328518e4000c840a142 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 408874f..8ac7f69 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2196,7 +2196,7 @@ -Specifies whether to generate a thumbnail image and place it inside the +Specifies whether to generate a thumbnail image and place it inside the the odf archive file, which makes it possible to see a preview of the document. Store a preview of this document @@ -3599,6 +3599,13 @@ 0 + + + +Specifies the background color of the start center. + + 7514196 + diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 1e6c4c8..e258b30 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -53,6 +53,8 @@ #include #include +#include + using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; @@ -70,7 +72,6 @@ const char OPEN_URL[] = ".uno:Open"; const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess"; float fMultiplier = 1.4f; -const Color aButtonsBackground(114, 168, 84); // TDF green const Color aButtonsText(COL_WHITE); /*** @@ -292,6 +293,8 @@ void BackingWindow::initControls() mpHelpButton->SetControlForeground(aButtonsText); mpExtensionsButton->SetControlForeground(aButtonsText); +const Color aButtonsBackground(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get()); + mpAllButtonsBox->SetBackground(aButtonsBackground); mpSmallButtonsBox->SetBackground(aButtonsBackground); mpHelpBox->SetBackground(aButtonsBackground); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 + sfx2/source/doc/objstor.cxx|6 -- 2 files changed, 13 insertions(+), 2 deletions(-) New commits: commit 0035b3218d8652652e62afe89eddfd28a9021b75 Author: christianju Date: Mon Feb 10 02:30:48 2014 +0100 fdo#61320: Allow user to choose whether to create thumbnails inside odf. Change-Id: I8c8129534ebcca32941ad76b201bb9a0243d8c3e diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 5349984..1e681e9 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2154,6 +2154,15 @@ false + + + +Specifies whether to generate a thumbnail image and place it inside the + the odf archive file, which makes it possible to see a preview of the document. +Store a preview of this document + + true + diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 965297c..883b75d 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -99,6 +99,7 @@ #include #include #include +#include #include #include @@ -1450,8 +1451,9 @@ sal_Bool SfxObjectShell::SaveTo_Impl } } - -if ( bOk && GetCreateMode() != SFX_CREATE_MODE_EMBEDDED && !bPasswdProvided ) +//fdo#61320: only store thumbnail image if the corresponding option is not disabled in the configuration +if ( bOk && officecfg::Office::Common::Save::Document::GenerateThumbnail::get() +&& GetCreateMode() != SFX_CREATE_MODE_EMBEDDED && !bPasswdProvided ) { // store the thumbnail representation image // the thumbnail is not stored in case of encrypted document ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 + sfx2/source/sidebar/Deck.cxx |4 --- sfx2/source/sidebar/SidebarController.cxx| 14 --- 3 files changed, 2 insertions(+), 18 deletions(-) New commits: commit 9a32ed36709cb03a8b5d3bcff0276bc31c934848 Author: Andre Fischer Date: Fri May 17 12:23:50 2013 + Resolves; #i122219# Show 'Cell Appearance' and 'Number Format' panels... when editing cells.(cherry picked from commit 09d043596e8283dd6ced26d1e4ff0da530252df0) Change-Id: I2fe0f9655efa24fb99b566f5c515b0fd1f651f6b diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index a92643a..cd69c01 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 @@ Calc, Auditing, visible ; Calc, Cell, visible ; +Calc, EditCell, visible ; Calc, default, visible ; Calc, Pivot,visible ; @@ -753,6 +754,7 @@ Calc, Auditing, hidden ; Calc, Cell, hidden ; +Calc, EditCell, hidden ; Calc, default, hidden ; Calc, Pivot,hidden ; diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 0fed648..9a16ad5 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 af0a547..7cc315e 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) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sfx2/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 15 sfx2/source/appl/app.cxx |1 unotools/Library_utl.mk|2 unotools/Package_inc.mk|2 unotools/inc/unotools/accelcfg.hxx | 65 -- unotools/inc/unotools/itemholderbase.hxx |9 unotools/inc/unotools/workingsetoptions.hxx| 122 - unotools/inc/unotools/xmlaccelcfg.hxx | 11 unotools/source/config/accelcfg.cxx| 202 unotools/source/config/itemholder1.cxx | 18 unotools/source/config/workingsetoptions.cxx | 304 - 11 files changed, 11 insertions(+), 740 deletions(-) New commits: commit 55664c9bd2469d3e493e6f1b67fbb2f96500d492 Author: Thomas Arnhold Date: Tue Apr 2 23:52:27 2013 +0200 unotools: remove some unused items Change-Id: I95bcac6a3ff8cf4644c9d1596c75cac2d9cd94fe Reviewed-on: https://gerrit.libreoffice.org/3191 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 66e353c..f819ebe 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3694,21 +3694,6 @@ - - - -Lists open documents or windows. - - - - - - - - Lists open documents or windows. - - - Contains settings specifying if a XML package is added to the diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 479f9d4..3b31dbd 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -113,7 +113,6 @@ #include #include #include -#include #include #include #include diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index d99c18b..dcef7a8 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Library_use_libraries,utl,\ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/accessibility/accessiblerelationsethelper \ unotools/source/accessibility/accessiblestatesethelper \ -unotools/source/config/accelcfg \ unotools/source/config/bootstrap \ unotools/source/config/cmdoptions \ unotools/source/config/compatibility \ @@ -104,7 +103,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/config/syslocaleoptions \ unotools/source/config/useroptions \ unotools/source/config/viewoptions \ -unotools/source/config/workingsetoptions \ unotools/source/config/xmlaccelcfg \ unotools/source/i18n/calendarwrapper \ unotools/source/i18n/caserotate \ diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk index 92ec12e..1a47ec1 100644 --- a/unotools/Package_inc.mk +++ b/unotools/Package_inc.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Package_Package,unotools_inc,$(SRCDIR)/unotools/inc)) -$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accelcfg.hxx,unotools/accelcfg.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblerelationsethelper.hxx,unotools/accessiblerelationsethelper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/accessiblestatesethelper.hxx,unotools/accessiblestatesethelper.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/atom.hxx,unotools/atom.hxx)) @@ -96,7 +95,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/ucbstreamhelper.hxx, $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/unotoolsdllapi.h,unotools/unotoolsdllapi.h)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/useroptions.hxx,unotools/useroptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/viewoptions.hxx,unotools/viewoptions.hxx)) -$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/workingsetoptions.hxx,unotools/workingsetoptions.hxx)) $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/xmlaccelcfg.hxx,unotools/xmlaccelcfg.hxx)) # vim: set noet sw=4 ts=4: diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx deleted file mode 100644 index c60a4f0..000 --- a/unotools/inc/unotools/accelcfg.hxx +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - *