embedserv/source/embed/servprov.cxx | 4 +---
vcl/unx/gtk3/gtkinst.cxx | 5 +++++
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 3c5ac66e21bc3b0efffe44743fbb5289da85a4f6
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jun 25 14:01:52 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jun 25 21:12:22 2021 +0200
-Werror,-Wunused-but-set-parameter (clang-cl 13 trunk)
...ever since a934115b3ea90d7883681a6ca8922a4b859be36f "Initial revision"
Change-Id: I8935da3ee1c78fcbe5e4858ab009ef4a387b594d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117884
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/embedserv/source/embed/servprov.cxx
b/embedserv/source/embed/servprov.cxx
index 8a1efd5152a5..ebf6c1eb2c28 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -168,11 +168,9 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG)
EmbedProviderFactory_Impl::Release()
return nCount;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP
EmbedProviderFactory_Impl::CreateInstance(IUnknown* punkOuter,
+COM_DECLSPEC_NOTHROW STDMETHODIMP
EmbedProviderFactory_Impl::CreateInstance(IUnknown*,
REFIID riid, void** ppv)
{
- punkOuter = nullptr;
-
IUnknown* pEmbedDocument =
static_cast<IUnknown*>(static_cast<IPersistStorage*>( new EmbedDocument_Impl(
m_xFactory, &m_guid ) ));
return pEmbedDocument->QueryInterface( riid, ppv );
commit b0eb7f3e7010539aad7c0d8496dfc539c87ed859
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jun 25 16:37:27 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jun 25 21:12:09 2021 +0200
gtk4: reenable calc format cells dialog
Change-Id: I512339745cb8f0e34068c38b88f1f53953ed8f06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117907
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index cb036803d5eb..9344c211425a 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22294,6 +22294,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget*
pParent, const OUString&
rUIFile != "cui/ui/bitmaptabpage.ui" &&
rUIFile != "cui/ui/borderpage.ui" &&
rUIFile != "cui/ui/breaknumberoption.ui" &&
+ rUIFile != "cui/ui/cellalignment.ui" &&
rUIFile != "cui/ui/charnamepage.ui" &&
rUIFile != "cui/ui/colorpage.ui" &&
rUIFile != "cui/ui/colorpickerdialog.ui" &&
@@ -22426,9 +22427,12 @@ weld::Builder*
GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
rUIFile != "modules/BasicIDE/ui/newlibdialog.ui" &&
rUIFile != "modules/BasicIDE/ui/organizedialog.ui" &&
rUIFile != "modules/scalc/ui/advancedfilterdialog.ui" &&
+ rUIFile != "modules/scalc/ui/analysisofvariancedialog.ui" &&
+ rUIFile != "modules/scalc/ui/cellprotectionpage.ui" &&
rUIFile != "modules/scalc/ui/checkwarningdialog.ui" &&
rUIFile != "modules/scalc/ui/colwidthdialog.ui" &&
rUIFile != "modules/scalc/ui/consolidatedialog.ui" &&
+ rUIFile != "modules/scalc/ui/correlationdialog.ui" &&
rUIFile != "modules/scalc/ui/dataform.ui" &&
rUIFile != "modules/scalc/ui/dataformfragment.ui" &&
rUIFile != "modules/scalc/ui/datastreams.ui" &&
@@ -22439,6 +22443,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget*
pParent, const OUString&
rUIFile != "modules/scalc/ui/doubledialog.ui" &&
rUIFile != "modules/scalc/ui/erroralerttabpage.ui" &&
rUIFile != "modules/scalc/ui/externaldata.ui" &&
+ rUIFile != "modules/scalc/ui/formatcellsdialog.ui" &&
rUIFile != "modules/scalc/ui/goalseekdlg.ui" &&
rUIFile != "modules/scalc/ui/groupdialog.ui" &&
rUIFile != "modules/scalc/ui/inputstringdialog.ui" &&
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
