[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/control/emojiview.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit c0ac99bd1f3b035260aa6a1a180e1e4b230ef554
Author: Julien Nabet
AuthorDate: Sat Sep 4 22:00:51 2021 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 6 13:47:10 2021 +0200
tdf#105689: fix path management to retrieve Emoji toolbar button
On Windows console logs show:
warn:sfx:7060:6444:sfx2/source/control/emojiview.cxx:105: Emoji config data
is empty
Change-Id: I85baf2fedc20ff855183147e9a178bb048ac75ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121653
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 37357e3cae749c54f1b9645c6670240baf860bc4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121564
Reviewed-by: Xisco Fauli
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121711
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/control/emojiview.cxx
b/sfx2/source/control/emojiview.cxx
index 63aa9ac602c9..ee902a9da207 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
#include
#include
#include
@@ -64,9 +65,12 @@ EmojiView::EmojiView(std::unique_ptr
xWindow)
: ThumbnailView(std::move(xWindow), nullptr)
{
// locate json data file
-OUString sPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER
"/emojiconfig/emoji.json");
-rtl::Bootstrap::expandMacros(sPath);
-std::string strPath = OUStringToOString(sPath.copy(strlen("file://")),
RTL_TEXTENCODING_UTF8).getStr();
+OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER
"/emojiconfig/emoji.json");
+rtl::Bootstrap::expandMacros(aURL);
+
+OUString aPath;
+osl::FileBase::getSystemPathFromFileURL(aURL, aPath);
+std::string strPath = OUStringToOString(aPath,
RTL_TEXTENCODING_UTF8).getStr();
std::ifstream file(strPath);
if(!file.is_open())
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/control/recentdocsview.cxx |1 +
sfx2/source/control/recentdocsviewitem.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit ca07445944d8a48e810a9399aef5792b92977194
Author: Caolán McNamara
AuthorDate: Thu Aug 12 16:01:51 2021 +0100
Commit: Xisco Fauli
CommitDate: Fri Aug 13 10:03:22 2021 +0200
Resolves: tdf#143843 disable the recently-used widget during load
We show a busy-cursor but the widget can still be interacted with so
another document can be launched by clicking on another recently-used
item while the first one is still loading, and the recently-used widget
isn't prepared for this scenario so the second to complete load will
crash.
Disable the recently-used widget when its cursor is set to busy, and in
the (unlikely) case that the load doesn't complete normally (missing
document or load filter error) and the recently-used widget still exists
and its cursor is unset from busy then reenable it for user input at
that point.
Change-Id: I8f4487f3dbede14c9778e49442366bd9445f1d63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120363
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index e74c354bef92..4bd614bf8836 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -431,6 +431,7 @@ IMPL_LINK( RecentDocsView, ExecuteHdl_Impl, void*, p, void )
{
pLoadRecentFile->pView->DispatchedLoadRecentUsedFile();
pLoadRecentFile->pView->SetPointer(PointerStyle::Arrow);
+pLoadRecentFile->pView->Enable();
}
delete pLoadRecentFile;
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index 8a047b20ee8d..d5dafe2d0e2c 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -178,6 +178,7 @@ void RecentDocsViewItem::OpenDocument()
{
// show busy mouse pointer
mrParentView.SetPointer(PointerStyle::Wait);
+mrParentView.Disable();
Reference xDispatch;
css::util::URL aTargetURL;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/sidebar/TabBar.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 80f5f74b661b52717ec2848b98cad3be8192b330
Author: Caolán McNamara
AuthorDate: Thu Jul 8 13:48:35 2021 +0100
Commit: Michael Stahl
CommitDate: Fri Jul 9 11:16:36 2021 +0200
tdf#143146 copy functor and arg before calling function that can delete this
Change-Id: I4e29fe6fa4119b709e31156afc5c2a5d08cdc072
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118625
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 8164c3e34884..881ec8f78fc2 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -248,13 +248,17 @@ TabBar::Item::~Item()
mrTabBar.GetContainer()->move(mxButton.get(), nullptr);
}
-
IMPL_LINK_NOARG(TabBar::Item, HandleClick, const OString&, void)
{
+// tdf#143146 copy the functor and arg before calling
+// GrabFocusToDocument which may destroy this object
+auto aDeckActivationFunctor = maDeckActivationFunctor;
+auto sDeckId = msDeckId;
+
mrTabBar.GrabFocusToDocument();
try
{
-maDeckActivationFunctor(msDeckId);
+aDeckActivationFunctor(sDeckId);
}
catch(const css::uno::Exception&)
{} // workaround for #i123198#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/dialog/mgetempl.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 73759beea46a7aa5b7c7c2dbc65cccf868a6af04
Author: Caolán McNamara
AuthorDate: Tue May 4 10:08:08 2021 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Tue May 4 21:38:46 2021 +0200
tdf#142017 set default focus widget
Change-Id: I5befe345d9c6ec499efdc1cf8305513ee8a53690
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114931
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 4ab0c2d2523c..eae174748abd 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -124,6 +124,7 @@
SfxManageStyleSheetPage::SfxManageStyleSheetPage(weld::Container* pPage, weld::D
m_xName->set_can_focus(true);
m_xName->set_editable(true);
m_xName->set_sensitive(true);
+m_xName->grab_focus(); // tdf#142017 default to focus within the page,
not in notebook tab
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/control/charmapcontrol.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1cbb39dc112117c4038ac63074c17154baa1d593
Author: Mike Kaganski
AuthorDate: Wed Apr 28 11:25:18 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Apr 29 11:07:18 2021 +0200
tdf#135997: fix toolbar control
This is the same as fc7b4bfeba39a2479c9a2c9c8ef5ced5ab3c0de7,
just for the toolbar control (the older one was for special
character dialog).
The problem was present since 800ac37021e3f8859a52c5eebca261a5d3bc5a11.
Change-Id: Ib86aa7336a3078ff28b417de37fbd5bc492c85c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114719
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
(cherry picked from commit b27de500b1412bacefc7144b5222c307ca1ae0fe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114731
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sfx2/source/control/charmapcontrol.cxx
b/sfx2/source/control/charmapcontrol.cxx
index 56af57524a88..ce580f1618b7 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -128,7 +128,7 @@ void SfxCharmapCtrl::updateFavCharControl()
{
int i = 0;
for ( std::deque< OUString >::iterator it = m_aFavCharList.begin(), it2 =
m_aFavCharFontList.begin();
-it != m_aFavCharList.end() || it2 != m_aFavCharFontList.end();
+it != m_aFavCharList.end() && it2 != m_aFavCharFontList.end();
++it, ++it2, i++)
{
m_aFavCharView[i].SetText(*it);
@@ -160,7 +160,7 @@ void SfxCharmapCtrl::updateRecentCharControl()
{
int i = 0;
for ( std::deque< OUString >::iterator it = m_aRecentCharList.begin(), it2
= m_aRecentCharFontList.begin();
-it != m_aRecentCharList.end() || it2 != m_aRecentCharFontList.end();
+it != m_aRecentCharList.end() && it2 != m_aRecentCharFontList.end();
++it, ++it2, i++)
{
m_aRecentCharView[i].SetText(*it);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/doc/docfile.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 9222d4f5dcf2f510bbccf4432d5c411745c12456 Author: Tor Lillqvist AuthorDate: Tue Apr 20 10:07:19 2021 +0300 Commit: Tor Lillqvist CommitDate: Tue Apr 20 10:40:50 2021 +0200 Avoid unused parameter warning in the HAVE_FEATURE_MACOSX_SANDBOX case Change-Id: I7cc2f8f373440ca79694220818558ee092c895a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114320 Reviewed-by: Michael Stahl Reviewed-by: Tor Lillqvist Tested-by: Jenkins diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 59865fb2b8eb..c56606a7859e 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -3628,6 +3628,7 @@ OUString GetLogicBase(const INetURLObject& rURL, std::unique_ptr // In a sandboxed environment we don't want to attempt to create temporary files in the same // directory where the user has selected an output file to be stored. The sandboxed process has // permission only to create the specifically named output file in that directory. +(void) rURL; (void) pImpl; #else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/sidebar/DeckLayouter.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 8782c6d577a195b97f00c13133ba367b830ac491
Author: Caolán McNamara
AuthorDate: Tue Mar 2 14:12:20 2021 +
Commit: Xisco Fauli
CommitDate: Tue Apr 6 12:14:01 2021 +0200
make Analog Clock sidebar extension demo work
from...
https://wiki.openoffice.org/wiki/Sidebar_for_Developers#Example:_Analog_Clock_Extension
http://people.apache.org/~af/clock/AnalogClock.oxt
presumably compatibility was broken at:
commit e66be44b69ee2a1b99bda32af93ea453c669b319
Date: Sun Jun 2 04:46:58 2013 +0200
sidebar: Restrict the minimal width of the sidebar.
Change-Id: Id1531d4531a3e9bceb3d37a9e74a7a06497098e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111868
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113525
Reviewed-by: Xisco Fauli
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index c4c9cd4b9a81..c9d59136c379 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -433,7 +433,16 @@ void GetRequestedSizes (
<< " Maximum: " << rItem.maLayoutSize.Maximum);
}
-sal_Int32 nWidth = xPanel->getMinimalWidth();
+sal_Int32 nWidth = rMinimalWidth;
+try
+{
+// The demo sidebar extension "Analog Clock" fails with
+// java.lang.AbstractMethodError here
+nWidth = xPanel->getMinimalWidth();
+}
+catch (...)
+{
+}
uno::Reference xDesktop
=
frame::Desktop::create(comphelper::getProcessComponentContext());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source sfx2/uiconfig
sfx2/source/sidebar/DeckTitleBar.cxx |4 ++--
sfx2/source/sidebar/PanelTitleBar.cxx |4 ++--
sfx2/uiconfig/ui/decktitlebar.ui |4 ++--
sfx2/uiconfig/ui/paneltitlebar.ui |4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 9250e8041e854e99fa7e53bb81a43dee987fab7b
Author: Caolán McNamara
AuthorDate: Thu Mar 4 10:41:37 2021 +
Commit: Xisco Fauli
CommitDate: Tue Mar 9 17:10:17 2021 +0100
master slide panel shouldn't have "more options" button
default the toolbox to hidden and show it if "more options" is enabled
Change-Id: I6ff867268809d949e7854e0e76d3e45c8806797b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111955
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx
b/sfx2/source/sidebar/DeckTitleBar.cxx
index f7e0a8df7b7e..c797fc274f78 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -121,14 +121,14 @@ void DeckTitleBar::SetCloserVisible (const bool
bIsCloserVisible)
if (mbIsCloserVisible)
{
-mxToolBox->set_item_visible("button", true);
+mxToolBox->show();
mxToolBox->set_item_icon_name("button", "sfx2/res/closedoc.png");
mxToolBox->set_item_tooltip_text("button",
SfxResId(SFX_STR_SIDEBAR_CLOSE_DECK));
}
else
{
-mxToolBox->set_item_visible("button", false);
+mxToolBox->hide();
}
}
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index d1ce0ef700e0..1de76008befd 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -98,7 +98,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString&
rsCommandName,
return;
if (!msMoreOptionsCommand.isEmpty())
-mxToolBox->set_item_visible(msIdent, false);
+mxToolBox->hide();
msMoreOptionsCommand = rsCommandName;
mxFrame = rxFrame;
@@ -116,7 +116,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString&
rsCommandName,
ControllerFactory::CreateToolBoxController(
*mxToolBox, *m_xBuilder, msMoreOptionsCommand, rxFrame,
rxController, true);
-mxToolBox->set_item_visible(msIdent, true);
+mxToolBox->show();
mxToolBox->set_item_icon_name(msIdent, "sfx2/res/symphony/morebutton.png");
mxToolBox->set_item_tooltip_text(msIdent,
SfxResId(SFX_STR_SIDEBAR_MORE_OPTIONS));
}
diff --git a/sfx2/uiconfig/ui/decktitlebar.ui b/sfx2/uiconfig/ui/decktitlebar.ui
index 0e48eddd815f..9349956950b7 100644
--- a/sfx2/uiconfig/ui/decktitlebar.ui
+++ b/sfx2/uiconfig/ui/decktitlebar.ui
@@ -1,5 +1,5 @@
-
+
@@ -52,8 +52,8 @@
-True
False
+True
icons
False
2
diff --git a/sfx2/uiconfig/ui/paneltitlebar.ui
b/sfx2/uiconfig/ui/paneltitlebar.ui
index 721abab47dfd..8664dfa88fc4 100644
--- a/sfx2/uiconfig/ui/paneltitlebar.ui
+++ b/sfx2/uiconfig/ui/paneltitlebar.ui
@@ -1,5 +1,5 @@
-
+
@@ -59,8 +59,8 @@
-True
False
+True
icons
False
2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/doc/SfxDocumentMetaData.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 6da480d946a7b881ca0cd482db16d8c32b5380ac
Author: Noel Grandin
AuthorDate: Sun Feb 14 19:25:40 2021 +0200
Commit: Noel Grandin
CommitDate: Mon Feb 15 10:45:48 2021 +0100
tdf#140308 Crash import old OpenOffice template
regression from
commit cfe5a5044845a3fc90e3634e996edb4d85808d3c
sfx2: use the fastparser API when possible
We end up using the OOo2OasisTransformer filter,
which is not fastparser compatible
Bisected with: bibisect-linux64-7.1
Change-Id: I7bd4191f098096034dc8ff368aba4b1ff313ce18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110883
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 228f43f2e3c2896c227f1ea30c5d16231acf66da)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110866
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 578322556b60..36d8dde0d75c 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -48,6 +48,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1765,13 +1766,19 @@ SfxDocumentMetaData::loadFromStorage(
xMsf->createInstanceWithArgumentsAndContext(
OUString::createFromAscii(pServiceName), args, m_xContext);
assert(xFilter);
-css::uno::Reference xDocHandler(xFilter,
css::uno::UNO_QUERY);
-assert(xDocHandler);
-css::uno::Reference xImp(xDocHandler,
css::uno::UNO_QUERY);
-assert(xImp);
+css::uno::Reference xFastParser(xFilter,
css::uno::UNO_QUERY);
+css::uno::Reference xImp(xFilter,
css::uno::UNO_QUERY_THROW);
xImp->setTargetDocument(css::uno::Reference(this));
try {
-xDocHandler->parseStream(input);
+if (xFastParser)
+xFastParser->parseStream(input);
+else
+{
+css::uno::Reference
xDocHandler(xFilter, css::uno::UNO_QUERY_THROW);
+css::uno::Reference xParser =
css::xml::sax::Parser::create(m_xContext);
+xParser->setDocumentHandler(xDocHandler);
+xParser->parseStream(input);
+}
} catch (const css::xml::sax::SAXException &) {
throw css::io::WrongFormatException(
"SfxDocumentMetaData::loadFromStorage:"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source sfx2/uiconfig
sfx2/source/appl/newhelp.cxx |1 -
sfx2/uiconfig/ui/helpwindow.ui |5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit a42e8da35681e5b3f944326bb175ff2ce05f5730
Author: Caolán McNamara
AuthorDate: Wed Jan 27 12:43:25 2021 +
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Jan 27 16:44:50 2021 +0100
tdf#138727 help browser didn't flow text
because of its size request, while the paned shrink lets the pane shrink
below the size request the contents stay at a min of the size request
and aren't really shrunk, just clipped. Instead don't let the pane
shrink but don't set a size.request letting it shrink to its natural
min of its contents which are then truly resized so the text flow works.
Change-Id: Iaf6738ace28c82379ac6322310de9a22f9653473
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109983
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 10e53fa6c435..25662b745aaa 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2451,7 +2451,6 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
m_xContainer->connect_size_allocate(LINK(this, SfxHelpWindow_Impl,
ResizeHdl));
m_xHelpPaneWindow = m_xBuilder->weld_container("helppanewindow");
m_xHelpTextWindow = m_xBuilder->weld_container("helptextwindow");
-
m_xHelpTextWindow->set_size_request(m_xHelpTextWindow->get_approximate_digit_width()
* 120, -1);
m_xHelpTextXWindow = m_xHelpTextWindow->CreateChildFrame();
pHelpInterceptor->InitWaiter( this );
diff --git a/sfx2/uiconfig/ui/helpwindow.ui b/sfx2/uiconfig/ui/helpwindow.ui
index 2505167b8c92..53f589bb67a4 100644
--- a/sfx2/uiconfig/ui/helpwindow.ui
+++ b/sfx2/uiconfig/ui/helpwindow.ui
@@ -20,7 +20,7 @@
-True
+False
False
@@ -43,7 +43,6 @@
True
False
icons
-False
True
@@ -196,7 +195,7 @@
True
-True
+False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/dialog/backingwindow.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 38d6d477791dd9c443a719227fdee9432dc39b85 Author: Caolán McNamara AuthorDate: Tue Jan 19 10:47:34 2021 + Commit: Michael Stahl CommitDate: Wed Jan 20 12:36:50 2021 +0100 silence "gsignal.c:2731: instance X has no handler with id Y" warning Change-Id: Iafc0aa085338fb41758fa845252f584c2a8aea76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109584 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index f7f98a86b11f..39183c2a748c 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -170,6 +170,7 @@ void BackingWindow::dispose() mxDrawAllButton.reset(); mxDBAllButton.reset(); mxMathAllButton.reset(); +mxBrandImage.reset(); mxHelpButton.reset(); mxExtensionsButton.reset(); mxAllButtonsBox.reset(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/dialog/versdlg.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit ace9232d4b5f47022d30dd9789e4b94448b89e24
Author: Stephan Bergmann
AuthorDate: Wed Jan 6 18:23:37 2021 +0100
Commit: Caolán McNamara
CommitDate: Fri Jan 8 12:09:43 2021 +0100
Missing construction of SfxCmisVersionsDialog::m_xVersionBox
...ever since b1baf73dc671069bedec18d170f8199b0766ea60 "weld
SfxCmisVersionsDialog". (Found by GCC 11 trunk with --enable-optimized,
> sfx2/source/dialog/versdlg.cxx: In constructor
‘SfxCmisVersionsDialog::SfxCmisVersionsDialog(weld::Window*, SfxViewFrame*)’:
> sfx2/source/dialog/versdlg.cxx:435:36: error: ‘this’ pointer null
[-Werror=nonnull]
> 435 |
m_xVersionBox->set_size_request(m_xVersionBox->get_approximate_digit_width() *
90,
> |
~~~^~~
> 436 |
m_xVersionBox->get_height_rows(15));
> |
~~~
)
Change-Id: I2720d6bc49af717951a0af6a262fb013a27e09df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108886
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 29e36c699c610be4fe6f8a2fe21ae3e4c8bdbd38)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108908
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 256b328e4978..72e55a6fc1f8 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -432,6 +432,7 @@ SfxCmisVersionsDialog::SfxCmisVersionsDialog(weld::Window*
pParent, SfxViewFrame
, m_xViewButton(m_xBuilder->weld_button("show"))
, m_xDeleteButton(m_xBuilder->weld_button("delete"))
, m_xCompareButton(m_xBuilder->weld_button("compare"))
+, m_xVersionBox(m_xBuilder->weld_tree_view("versions"))
{
m_xVersionBox->set_size_request(m_xVersionBox->get_approximate_digit_width() *
90,
m_xVersionBox->get_height_rows(15));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source sw/inc sw/sdi sw/source
sfx2/source/control/unoctitm.cxx|4 ++--
sw/inc/mdiexp.hxx |5 +
sw/inc/view.hxx |2 +-
sw/sdi/swriter.sdi |2 +-
sw/source/core/view/viewsh.cxx | 26 +-
sw/source/uibase/docvw/edtwin3.cxx |5 ++---
sw/source/uibase/inc/bookctrl.hxx |3 ---
sw/source/uibase/uiview/pview.cxx | 14 +-
sw/source/uibase/uiview/view2.cxx | 34 --
sw/source/uibase/utlui/bookctrl.cxx | 20
10 files changed, 45 insertions(+), 70 deletions(-)
New commits:
commit 2bd03b6de32a8bd6ff7d075752eda051a43e4add
Author: Jim Raykowski
AuthorDate: Fri Sep 18 01:32:01 2020 -0800
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Dec 23 08:51:50 2020 +0100
tdf#89709 Make statusbar page number/bookmarks control tooltip show
Change-Id: I3a84ae29d4758799e1ee7e2ab1349ca3b30fb5f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102883
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
(cherry picked from commit c81fea2e78d66c1978cb2340868c938ba9d6c9f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107701
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index d51e5f3b443f..b32235b4ca48 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1211,7 +1211,6 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "RowColSelCount" ||
aEvent.FeatureURL.Path == "StatusPageStyle" ||
aEvent.FeatureURL.Path == "StateTableCell" ||
- aEvent.FeatureURL.Path == "StatePageNumber" ||
aEvent.FeatureURL.Path == "StateWordCount" ||
aEvent.FeatureURL.Path == "PageStyleName" ||
aEvent.FeatureURL.Path == "PageStatus" ||
@@ -1271,7 +1270,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aBuffer.append(OUString::number(aSize.Width)).append(" x
").append(OUString::number(aSize.Height));
}
}
-else if (aEvent.FeatureURL.Path == "LanguageStatus")
+else if (aEvent.FeatureURL.Path == "LanguageStatus" ||
+ aEvent.FeatureURL.Path == "StatePageNumber")
{
css::uno::Sequence< OUString > aSeq;
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index eee934b66ddf..3901fce1c12f 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -34,10 +34,7 @@ extern bool IsScrollMDI(SwViewShell const * pVwSh, const
SwRect &);
extern void SizeNotify(SwViewShell const * pVwSh, const Size &);
// Update of status bar during an action.
-extern void PageNumNotify( SwViewShell const * pVwSh,
-sal_uInt16 nPhyNum,
-sal_uInt16 nVirtNum,
- const OUString& rPg );
+extern void PageNumNotify(SwViewShell const * pVwSh);
enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
extern void FrameNotify( SwViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 280388e1ac25..abdba739c3b7 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -547,7 +547,7 @@ public:
voidInsertCaption(const InsCaptionOpt *pOpt);
// Async call by Core
-voidUpdatePageNums(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const
OUString& rPgStr);
+void UpdatePageNums();
OUStringGetPageStr(sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, const
OUString& rPgStr);
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index ccfc2821c4dc..9a03663dc19d 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -5785,7 +5785,7 @@ SfxVoidItem StateBookmark FN_STAT_BOOKMARK
GroupId = SfxGroupId::Intern;
]
-SfxStringItem StatePageNumber FN_STAT_PAGE
+SfxStringListItem StatePageNumber FN_STAT_PAGE
[
AutoUpdate = FALSE,
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 1cc7288a6200..acf81134ba6b 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1043,25 +1043,17 @@ void SwViewShell::SizeChgNotify()
if ( !Imp()->IsCalcLayoutProgress() && dynamic_cast( this ) != nullptr )
{
-const SwFrame *pCnt =
static_cast(this)->GetCurrFrame( false );
-const SwPageFrame *pPage;
-if ( pCnt && nullptr != (pPage = pCnt->FindPageFrame()) )
-{
-const sal_uInt16 nVirtNum = pPage->GetVirtPageNum();
-const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
-OUString sDisplay = rNum.GetNumStr( nVirtNum );
-PageNumNotify( this, pCnt->GetPhyPageNum(), nVirtNum, sDisplay
);
+PageNumNotify(this);
-if (comphelper::LibreOfficeKit::isActive())
-{
-
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/doc/templatedlg.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit cba301460f1aaa1834e72796935cc1e88d74c19b Author: Caolán McNamara AuthorDate: Fri Dec 18 13:16:18 2020 + Commit: Caolán McNamara CommitDate: Fri Dec 18 16:48:46 2020 +0100 Delete Category dialog includes '~' text in the titlebar Change-Id: I8581e5219ffc690e686a0d563463c19b682ea04b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107910 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 313bf591862a..26787f0d2ac9 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -1110,7 +,7 @@ void SfxTemplateManagerDlg::OnCategoryDelete() SfxTemplateCategoryDialog aDlg(m_xDialog.get()); aDlg.SetCategoryLBEntries(mxLocalView->getFolderNames()); aDlg.HideNewCategoryOption(); -aDlg.set_title(SfxResId(STR_CATEGORY_DELETE)); + aDlg.set_title(MnemonicGenerator::EraseAllMnemonicChars(SfxResId(STR_CATEGORY_DELETE))); aDlg.SetSelectLabelText(SfxResId(STR_CATEGORY_SELECT)); if (aDlg.run() == RET_OK) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/sidebar/TabBar.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 53d40fb451e0cb477cdb80091a19e61220814a1d
Author: Caolán McNamara
AuthorDate: Tue Dec 15 14:33:32 2020 +
Commit: Caolán McNamara
CommitDate: Wed Dec 16 09:45:37 2020 +0100
tdf#138938 put the tooltip on the toolbar item instead of the toolbar
Change-Id: I69ff3813a726f26daa20a00ce3a0bb311a162c39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107703
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index fdbf3cb01b15..8164c3e34884 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -223,6 +223,7 @@ void TabBar::CreateTabItem(weld::Toolbar& rItem, const
DeckDescriptor& rDeckDesc
rItem.set_accessible_name(rDeckDescriptor.msTitle);
rItem.set_accessible_description(rDeckDescriptor.msHelpText);
rItem.set_tooltip_text(rDeckDescriptor.msHelpText);
+rItem.set_item_tooltip_text("toggle", rDeckDescriptor.msHelpText);
}
css::uno::Reference TabBar::GetItemImage(const
DeckDescriptor& rDeckDescriptor) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d2055db8d7b13b34e526cc16f5c084505e6de331 Author: Caolán McNamara AuthorDate: Tue Dec 15 14:51:47 2020 + Commit: Caolán McNamara CommitDate: Tue Dec 15 18:12:51 2020 +0100 tdf#138935 rsDeckId is invalid by the time collectUIInformation is called Change-Id: I4afc1ed1bbbfbbd510617a51b9aa6d627471d80d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107705 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 9c5ebda77897..98c8acbc6c67 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -627,6 +627,8 @@ void SidebarController::OpenThenToggleDeck ( } } RequestOpenDeck(); +// before SwitchToDeck which may cause the rsDeckId string to be released +collectUIInformation(rsDeckId); SwitchToDeck(rsDeckId); // Make sure the sidebar is wide enough to fit the requested content @@ -637,8 +639,6 @@ void SidebarController::OpenThenToggleDeck ( if (mnSavedSidebarWidth < nRequestedWidth) SetChildWindowWidth(nRequestedWidth); } - -collectUIInformation(rsDeckId); } void SidebarController::OpenThenSwitchToDeck ( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 4aa9cb784469b8c13660f36c829c0fadc11c922b
Author: Aron Budea
AuthorDate: Wed Dec 9 18:39:54 2020 +0100
Commit: Aron Budea
CommitDate: Fri Dec 11 11:03:42 2020 +0100
tdf#138762: crash when trying to open sidebar w chart in Writer
In Writer when in chart edit mode, and the chart is deselected,
the object selection remains. Opening Properties sidebar at
this point crashed. Calc and Impress were unaffected.
Regression from b5fdb148fe87a90f3e586efcea7aa6ef865fa42a
Change-Id: I356c3a42c41dd38e4739df27c72c6d67722b1dbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107500
Tested-by: Jenkins
Reviewed-by: Aron Budea
(cherry picked from commit 7e5991dc695d1e590483615c2907811ce4117834)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107542
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 5b13e599afb1..9c5ebda77897 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -630,10 +630,13 @@ void SidebarController::OpenThenToggleDeck (
SwitchToDeck(rsDeckId);
// Make sure the sidebar is wide enough to fit the requested content
-sal_Int32 nRequestedWidth = (mpCurrentDeck->GetMinimalWidth() +
TabBar::GetDefaultWidth())
-* mpTabBar->GetDPIScaleFactor();
-if (mnSavedSidebarWidth < nRequestedWidth)
-SetChildWindowWidth(nRequestedWidth);
+if (mpCurrentDeck && mpTabBar)
+{
+sal_Int32 nRequestedWidth = (mpCurrentDeck->GetMinimalWidth() +
TabBar::GetDefaultWidth())
+* mpTabBar->GetDPIScaleFactor();
+if (mnSavedSidebarWidth < nRequestedWidth)
+SetChildWindowWidth(nRequestedWidth);
+}
collectUIInformation(rsDeckId);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/sidebar/TabBar.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ebc76496be42f1ca9141c94cc544a3fa922cad38
Author: Caolán McNamara
AuthorDate: Tue Dec 1 10:24:26 2020 +
Commit: Caolán McNamara
CommitDate: Wed Dec 9 21:06:48 2020 +0100
cid#1470371 Uninitialized scalar field
Change-Id: Ida60f251e83ea150e563bc0ef5a2be64f481fb08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 9738ae6ca29f..fdbf3cb01b15 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -237,6 +237,8 @@ TabBar::Item::Item(TabBar& rTabBar)
: mrTabBar(rTabBar)
, mxBuilder(Application::CreateBuilder(rTabBar.GetContainer(),
"sfx/ui/tabbutton.ui"))
, mxButton(mxBuilder->weld_toolbar("button"))
+, mbIsHidden(false)
+, mbIsHiddenByDefault(false)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 33ca9483169c6e1f9675893dcfbd62cdda36f1b4 Author: Caolán McNamara AuthorDate: Tue Dec 1 12:24:20 2020 + Commit: Caolán McNamara CommitDate: Tue Dec 1 16:38:07 2020 +0100 Resolves: tdf#138417 crash on customize sidebar Change-Id: Icbb08b44e7f8729704d8278378a259fecb9bee4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106944 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index f359e768665e..5b13e599afb1 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -1182,6 +1182,7 @@ IMPL_LINK(SidebarController, OnSubMenuItemSelected, const OString&, rCurItemId, IsDocumentReadOnly(), mxFrame->getController()); // Notify the tab bar about the updated set of decks. +maFocusManager.Clear(); mpTabBar->SetDecks(aDecks); mpTabBar->HighlightDeck(mpCurrentDeck->GetId()); mpTabBar->UpdateFocusManager(maFocusManager); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/dialog/mgetempl.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit e0c1dcd97edc1194e4445a45a815406446c1c7d7
Author: shubham656
AuthorDate: Tue Nov 24 02:09:30 2020 +0530
Commit: Xisco Fauli
CommitDate: Tue Nov 24 11:40:37 2020 +0100
tdf#132860 Assign value to set_sensitive flag in m_xName
Change-Id: I9438e1a18253d90ff26e71b3aab83e96468fb9d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106461
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
(cherry picked from commit 1795cfde106c830bff513d3a9ff27d1759f9b227)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106441
Reviewed-by: Xisco Fauli
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 46536f3f4d8c..4ab0c2d2523c 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -123,6 +123,11 @@
SfxManageStyleSheetPage::SfxManageStyleSheetPage(weld::Container* pPage, weld::D
{
m_xName->set_can_focus(true);
m_xName->set_editable(true);
+m_xName->set_sensitive(true);
+}
+else
+{
+m_xName->set_sensitive(false);
}
if ( pStyle->HasFollowSupport() && pPool )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
