[Libreoffice-commits] core.git: uui/inc

2023-10-11 Thread Henry Castro (via logerrit) 
 uui/inc/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 55c7c0667b00a2841819ce961284e3e47ea96fce
Author: Henry Castro 
AuthorDate: Wed Sep 27 13:13:21 2023 -0400
Commit: Caolán McNamara 
CommitDate: Wed Oct 11 09:53:35 2023 +0200

sfx2: fix typo

Signed-off-by: Henry Castro 
Change-Id: I73e4890c024a2ab74ea3d4141c63304c167ba4c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157751
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
index b6daff517f51..c78beb9efaba 100644
--- a/uui/inc/strings.hrc
+++ b/uui/inc/strings.hrc
@@ -78,6 +78,6 @@
 #define STR_RELOADEDITABLE_TITLE
NC_("STR_RELOADEDITABLE_TITLE", "Document is now editable")
 #define STR_RELOADEDITABLE_MSG  NC_("STR_RELOADEDITABLE_MSG", 
"Document file '$(ARG1)' is now editable \n\nReload this document for editing?")
 #define STR_RELOADEDITABLE_BTN  NC_("STR_RELOADEDITABLE_BTN", 
"~Reload")
-#define STR_LOADREADONLY_MSGNC_("STR_LOADREADONLY_MSG", 
"The author would like you to open '$(ARG1)' as read-only unless you need to 
make changes. Open as read-only?.")
+#define STR_LOADREADONLY_MSGNC_("STR_LOADREADONLY_MSG", 
"The author would like you to open '$(ARG1)' as read-only unless you need to 
make changes. Open as read-only?")
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: uui/inc uui/source

2023-10-09 Thread Henry Castro (via logerrit) 
 uui/inc/strings.hrc|1 
 uui/source/iahndl-errorhandler.cxx |   39 +
 uui/source/iahndl.cxx  |   11 ++
 uui/source/iahndl.hxx  |5 
 4 files changed, 56 insertions(+)

New commits:
commit 7fee80fdf4625af4bb8c4273e2cab7bf8b9b46df
Author: Henry Castro 
AuthorDate: Wed Sep 6 10:27:12 2023 -0400
Commit: Henry Castro 
CommitDate: Mon Oct 9 13:42:45 2023 +0200

uui: implement "handleLoadReadOnlyRequest"

Is used for interaction handle to query user decision
regarding to open the document read only.

Signed-off-by: Henry Castro 
Change-Id: Ia6792ca540b5c62f4c9de8a5793ef45de3740484
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156622
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157660
Tested-by: Jenkins

diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
index 98bd94ef8484..b6daff517f51 100644
--- a/uui/inc/strings.hrc
+++ b/uui/inc/strings.hrc
@@ -78,5 +78,6 @@
 #define STR_RELOADEDITABLE_TITLE
NC_("STR_RELOADEDITABLE_TITLE", "Document is now editable")
 #define STR_RELOADEDITABLE_MSG  NC_("STR_RELOADEDITABLE_MSG", 
"Document file '$(ARG1)' is now editable \n\nReload this document for editing?")
 #define STR_RELOADEDITABLE_BTN  NC_("STR_RELOADEDITABLE_BTN", 
"~Reload")
+#define STR_LOADREADONLY_MSGNC_("STR_LOADREADONLY_MSG", 
"The author would like you to open '$(ARG1)' as read-only unless you need to 
make changes. Open as read-only?.")
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/iahndl-errorhandler.cxx 
b/uui/source/iahndl-errorhandler.cxx
index 74e3253c5220..c89e66b93c35 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -33,6 +33,7 @@
 #include 
 
 #include 
+#include 
 #include "getcontinuations.hxx"
 
 #include "iahndl.hxx"
@@ -290,4 +291,42 @@ UUIInteractionHelper::handleErrorHandlerRequest(
 }
 }
 
+void
+UUIInteractionHelper::handleLoadReadOnlyRequest(
+const OUString& sDocumentURL,
+uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
+rContinuations)
+{
+std::locale aLocale(Translate::Create("uui"));
+std::vector aArguments = { sDocumentURL };
+uno::Reference xRetry;
+uno::Reference xAbort;
+uno::Reference xApprove;
+uno::Reference xDisapprove;
+uno::Reference xParent = getParentXWindow();
+OUString aMessage(Translate::get(STR_LOADREADONLY_MSG, aLocale));
+
+aMessage = replaceMessageWithArguments(aMessage, aArguments);
+getContinuations(rContinuations, , , , 
);
+
+std::unique_ptr xBox(
+Application::CreateMessageDialog(Application::GetFrameWeld(xParent),
+ VclMessageType::Question,
+ VclButtonsType::YesNo,
+ aMessage,
+ GetpApp()));
+
+if (xBox->run() == RET_YES)
+{
+if (xApprove.is())
+xApprove->select();
+}
+else
+{
+if (xDisapprove.is())
+xDisapprove->select();
+}
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 3eed5811f202..bc6f12742b47 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -810,6 +810,17 @@ UUIInteractionHelper::handleRequest_impl(
 return true;
 }
 
+OUString aFileName;
+beans::NamedValue aLoadReadOnlyRequest;
+if ((aAnyRequest >>= aLoadReadOnlyRequest) &&
+aLoadReadOnlyRequest.Name == "LoadReadOnlyRequest" &&
+(aLoadReadOnlyRequest.Value >>= aFileName))
+{
+handleLoadReadOnlyRequest(aFileName,
+  rRequest->getContinuations());
+return true;
+}
+
 // Last chance: interaction handlers registered in the 
configuration
 
 
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 78d283d6bf0e..cf468f57dbcf 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -238,6 +238,11 @@ private:
 const OUString & instructions,
 const OUString & url,
 css::uno::Sequence< css::uno::Reference< 
css::task::XInteractionContinuation > > const & rContinuations );
+
+void
+handleLoadReadOnlyRequest(
+const OUString& sDocumentURL,
+css::uno::Sequence< css::uno::Reference< 
css::task::XInteractionContinuation > > const & rContinuations);
 };
 
 class ErrorResource

[Libreoffice-commits] core.git: uui/inc

2022-02-27 Thread Julien Nabet (via logerrit) 
 uui/inc/ids.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54e7ac4a8aa5bda78f1c41093fc0d10a56313305
Author: Julien Nabet 
AuthorDate: Sun Feb 27 10:56:00 2022 +0100
Commit: Julien Nabet 
CommitDate: Sun Feb 27 11:44:03 2022 +0100

tdf#145829: typo ERRCODE_UUI_IO_MODULESIZEEXCEEDED ("basic" instead of 
"BASIC")

Change-Id: I0dc23d9aadd727efb3a9acb2f5361505afe8233e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130618
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc
index 89fb6bda1dcb..7359fe79f74f 100644
--- a/uui/inc/ids.hrc
+++ b/uui/inc/ids.hrc
@@ -37,7 +37,7 @@ const std::pair RID_UUI_ERRHDL[] =
   ERRCODE_UUI_IO_ALREADYEXISTS },
 { NC_("RID_UUI_ERRHDL", "Target already exists."),
   ERRCODE_UUI_IO_TARGETALREADYEXISTS },
-{ NC_("RID_UUI_ERRHDL", "You are about to save/export a password protected 
basic library containing module(s) \n$(ARG1)\nwhich are too large to store in 
binary format. If you wish users that don't have access to the library password 
to be able to run macros in those module(s) you must split those modules into a 
number of smaller modules. Do you wish to continue to save/export this 
library?"),
+{ NC_("RID_UUI_ERRHDL", "You are about to save/export a password protected 
BASIC library containing module(s) \n$(ARG1)\nwhich are too large to store in 
binary format. If you wish users that don't have access to the library password 
to be able to run macros in those module(s) you must split those modules into a 
number of smaller modules. Do you wish to continue to save/export this 
library?"),
   ERRCODE_UUI_IO_MODULESIZEEXCEEDED },
 { NC_("RID_UUI_ERRHDL", "Beware!\n\nYou are about to load a very unusual 
sort of file ($(ARG2)) from the URL:\n\n$(ARG1)\n\nAre you certain that this 
file is a legacy document created many years ago?"),
   ERRCODE_UUI_IO_EXOTICFILEFORMAT },

[Libreoffice-commits] core.git: uui/inc uui/IwyuFilter_uui.yaml uui/qa uui/source

2020-02-04 Thread Gabor Kelemen (via logerrit) 
 uui/IwyuFilter_uui.yaml  |   13 +
 uui/inc/ids.hrc  |6 ++
 uui/qa/unit/uui-dialogs-test.cxx |3 ---
 uui/source/authfallbackdlg.cxx   |2 --
 uui/source/fltdlg.cxx|3 ---
 uui/source/iahndl-authentication.cxx |1 -
 uui/source/iahndl-errorhandler.cxx   |2 --
 uui/source/iahndl-filter.cxx |3 +--
 uui/source/iahndl-locking.cxx|2 --
 uui/source/iahndl-ssl.cxx|1 -
 uui/source/iahndl.cxx|4 
 uui/source/iahndl.hxx|1 -
 uui/source/lockcorrupt.cxx   |1 -
 uui/source/logindlg.cxx  |6 --
 uui/source/loginerr.hxx  |2 +-
 uui/source/masterpasscrtdlg.cxx  |1 -
 uui/source/masterpasscrtdlg.hxx  |1 -
 uui/source/passwordcontainer.hxx |1 +
 uui/source/secmacrowarnings.cxx  |6 +-
 uui/source/secmacrowarnings.hxx  |3 ++-
 uui/source/services.cxx  |3 ---
 uui/source/sslwarndlg.cxx|3 ---
 uui/source/sslwarndlg.hxx|1 -
 uui/source/unknownauthdlg.cxx|3 ---
 uui/source/unknownauthdlg.hxx|1 -
 25 files changed, 25 insertions(+), 48 deletions(-)

New commits:
commit b2bfa6266ce88e9507add78280d5f5d436277173
Author: Gabor Kelemen 
AuthorDate: Fri Jan 31 21:08:53 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Feb 4 13:25:51 2020 +0100

tdf#42949 Fix IWYU warnings in uui/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ic48d61a5f5d24742682b4d39096e468f224639df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87783
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/uui/IwyuFilter_uui.yaml b/uui/IwyuFilter_uui.yaml
new file mode 100644
index ..09edc89394e5
--- /dev/null
+++ b/uui/IwyuFilter_uui.yaml
@@ -0,0 +1,13 @@
+---
+assumeFilename: uui/source/iahndl.cxx
+blacklist:
+uui/inc/ids.hxx:
+# Needed by macro defines
+- vcl/errcode.hxx
+uui/source/iahndl.cxx:
+# Actually used
+- com/sun/star/awt/XWindow.hpp
+- com/sun/star/task/XInteractionRequest.hpp
+uui/source/passwordcontainer.cxx:
+# Actually used
+- com/sun/star/lang/XMultiServiceFactory.hpp
diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc
index 061c2a77bd80..744542bf7697 100644
--- a/uui/inc/ids.hrc
+++ b/uui/inc/ids.hrc
@@ -20,6 +20,12 @@
 #ifndef INCLUDED_UUI_INC_IDS_HRC
 #define INCLUDED_UUI_INC_IDS_HRC
 
+#include 
+
+#include 
+
+#include "ids.hxx"
+
 #define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
 
 const std::pair RID_UUI_ERRHDL[] =
diff --git a/uui/qa/unit/uui-dialogs-test.cxx b/uui/qa/unit/uui-dialogs-test.cxx
index 16e57ba99ae1..3ad47fd79f1c 100644
--- a/uui/qa/unit/uui-dialogs-test.cxx
+++ b/uui/qa/unit/uui-dialogs-test.cxx
@@ -9,9 +9,6 @@
 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 
 using namespace ::com::sun::star;
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index c147a7f1b9a7..3fa4fc1655a9 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -9,8 +9,6 @@
 
 #include "authfallbackdlg.hxx"
 
-#include 
-
 AuthFallbackDlg::AuthFallbackDlg(weld::Window* pParent, const OUString& 
instructions,
  const OUString& url)
 : GenericDialogController(pParent, "uui/ui/authfallback.ui", 
"AuthFallbackDlg")
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 989a915301b3..49c2f82cb618 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -19,14 +19,11 @@
 
 #include "fltdlg.hxx"
 
-#include 
-
 #include 
 #include 
 #include 
 
 #include 
-#include 
 
 namespace uui
 {
diff --git a/uui/source/iahndl-authentication.cxx 
b/uui/source/iahndl-authentication.cxx
index ec888dca9e4a..0a4cca10a817 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/uui/source/iahndl-errorhandler.cxx 
b/uui/source/iahndl-errorhandler.cxx
index 1faa1f59990b..6abe1c30cfc4 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -28,11 +28,9 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 
-#include 
 #include 
 #include "getcontinuations.hxx"
 
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 25a13a84e275..706c568aa40a 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -19,13 +19,12 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 8df6c85b0608..f4297754d6b5 100644
--- a/uui/source/iahndl-locking.cxx
+++

[Libreoffice-commits] core.git: uui/inc

2018-12-16 Thread Libreoffice Gerrit user 
 uui/inc/strings.hrc |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9bc346dc55bd62f68b8d943d522810b28d84b0dc
Author: Roman Kuznetsov 
AuthorDate: Thu Dec 13 11:14:04 2018 +0100
Commit: Mike Kaganski 
CommitDate: Sun Dec 16 17:10:13 2018 +0100

tdf#119217  Deleting of unnecessary empty space in Document in use dialog

Change-Id: I5d965f683520289c5f2466c5429c6fe8b574200a
Reviewed-on: https://gerrit.libreoffice.org/65086
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
index 7c327b579738..ed2d00550273 100644
--- a/uui/inc/strings.hrc
+++ b/uui/inc/strings.hrc
@@ -47,8 +47,8 @@
 #define STR_LOCKFAILED_OPENREADONLY_BTN 
NC_("STR_LOCKFAILED_OPENREADONLY_BTN", "Open ~Read-Only")
 
 #define STR_OPENLOCKED_TITLENC_("STR_OPENLOCKED_TITLE", 
"Document in Use")
-#define STR_OPENLOCKED_MSG  NC_("STR_OPENLOCKED_MSG", 
"Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nOpen document 
read-only or open a copy of the document for editing.\n\n$(ARG3)")
-#define STR_OPENLOCKED_ALLOWIGNORE_MSG  
NC_("STR_OPENLOCKED_ALLOWIGNORE_MSG", "You may also ignore the file locking and 
open the document for editing.")
+#define STR_OPENLOCKED_MSG  NC_("STR_OPENLOCKED_MSG", 
"Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nOpen document 
read-only or open a copy of the document for editing.$(ARG3)")
+#define STR_OPENLOCKED_ALLOWIGNORE_MSG  
NC_("STR_OPENLOCKED_ALLOWIGNORE_MSG", "\nYou may also ignore the file locking 
and open the document for editing.")
 #define STR_OPENLOCKED_OPENREADONLY_BTN 
NC_("STR_OPENLOCKED_OPENREADONLY_BTN", "Open ~Read-Only")
 #define STR_OPENLOCKED_OPENCOPY_BTN 
NC_("STR_OPENLOCKED_OPENCOPY_BTN", "Open ~Copy")
 #define STR_UNKNOWNUSER NC_("STR_UNKNOWNUSER", 
"Unknown User")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: uui/inc uui/source uui/uiconfig

2018-03-20 Thread Caolán McNamara 
 uui/inc/pch/precompiled_uui.hxx|1 
 uui/source/iahndl.cxx  |   12 +-
 uui/source/secmacrowarnings.cxx|  126 +++
 uui/source/secmacrowarnings.hxx|   36 ++
 uui/uiconfig/ui/macrowarnmedium.ui |  195 +++--
 5 files changed, 118 insertions(+), 252 deletions(-)

New commits:
commit 44bf46c1bb9ba884e2ed2042ef995f198460cc28
Author: Caolán McNamara 
Date:   Tue Mar 20 09:39:24 2018 +

weld MacroWarning

Change-Id: I9ec8ce9b0d5bb973f75606d850fb5961a85865cd
Reviewed-on: https://gerrit.libreoffice.org/51630
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/uui/inc/pch/precompiled_uui.hxx b/uui/inc/pch/precompiled_uui.hxx
index e233152d4011..ca2e75cbe217 100644
--- a/uui/inc/pch/precompiled_uui.hxx
+++ b/uui/inc/pch/precompiled_uui.hxx
@@ -55,7 +55,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 439c223d5e52..60f281e1d4c5 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -1173,20 +1173,20 @@ UUIInteractionHelper::handleMacroConfirmRequest(
 bool bApprove = false;
 
 bool bShowSignatures = aSignInfo.getLength() > 0;
-ScopedVclPtrInstance aWarning(
-getParentProperty(), bShowSignatures );
+vcl::Window* pWin = getParentProperty();
+MacroWarning aWarning(pWin ? pWin->GetFrameWeld() : nullptr, 
bShowSignatures);
 
-aWarning->SetDocumentURL( aDocumentURL );
+aWarning.SetDocumentURL(aDocumentURL);
 if ( aSignInfo.getLength() > 1 )
 {
-aWarning->SetStorage( xZipStorage, aDocumentVersion, aSignInfo );
+aWarning.SetStorage(xZipStorage, aDocumentVersion, aSignInfo);
 }
 else if ( aSignInfo.getLength() == 1 )
 {
-aWarning->SetCertificate( aSignInfo[ 0 ].Signer );
+aWarning.SetCertificate(aSignInfo[0].Signer);
 }
 
-bApprove = aWarning->Execute() == RET_OK;
+bApprove = aWarning.run() == RET_OK;
 
 if ( bApprove && xApprove.is() )
 xApprove->select();
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 6c2ae03f53d6..9363db6a0265 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -23,10 +23,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-
-#include 
-#include 
+#include 
 #include 
 
 using namespace ::com::sun::star::security;
@@ -62,58 +61,37 @@ namespace
 }
 }
 
-
-MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures )
-:ModalDialog( _pParent, "MacroWarnMedium", 
"uui/ui/macrowarnmedium.ui" )
-,mpInfos( nullptr )
-,mbSignedMode   ( true )
-,mbShowSignatures   ( _bWithSignatures )
-,mnActSecLevel  ( 0 )
+MacroWarning::MacroWarning(weld::Window* pParent, bool _bWithSignatures)
+: MessageDialogController(pParent, "uui/ui/macrowarnmedium.ui", 
"MacroWarnMedium", "grid")
+, mxGrid(m_xBuilder->weld_widget("grid"))
+, mxSignsFI(m_xBuilder->weld_label("signsLabel"))
+, mxViewSignsBtn(m_xBuilder->weld_button("viewSignsButton"))
+, mxAlwaysTrustCB(m_xBuilder->weld_check_button("alwaysTrustCheckbutton"))
+, mxEnableBtn(m_xBuilder->weld_button("ok"))
+, mxDisableBtn(m_xBuilder->weld_button("cancel"))
+, mpInfos( nullptr )
+, mbSignedMode   ( true )
+, mbShowSignatures   ( _bWithSignatures )
+, mnActSecLevel  ( 0 )
 {
-get(mpSymbolImg, "symbolImage");
-get(mpDocNameFI, "docNameLabel");
-get(mpDescr1FI, "descr1Label");
-get(mpDescr1aFI, "descr1aLabel");
-get(mpSignsFI, "signsLabel");
-get(mpViewSignsBtn, "viewSignsButton");
-get(mpDescr2FI, "descr2Label");
-get(mpAlwaysTrustCB, "alwaysTrustCheckbutton");
-get(mpEnableBtn, "ok");
-get(mpDisableBtn, "cancel");
+
m_xDialog->set_title(Translate::GetReadStringHook()(m_xDialog->get_title()));
 
 InitControls();
 
-mpDisableBtn->SetClickHdl( LINK( this, MacroWarning, DisableBtnHdl ) );
-mpEnableBtn->SetClickHdl( LINK( this, MacroWarning, EnableBtnHdl ) );
-mpDisableBtn->GrabFocus(); // Default button, but focus is on view button
-}
-
-MacroWarning::~MacroWarning()
-{
-disposeOnce();
-}
-
-void MacroWarning::dispose()
-{
-mpSymbolImg.clear();
-mpDocNameFI.clear();
-mpDescr1aFI.clear();
-mpDescr1FI.clear();
-mpSignsFI.clear();
-mpViewSignsBtn.clear();
-mpDescr2FI.clear();
-mpAlwaysTrustCB.clear();
-mpEnableBtn.clear();
-mpDisableBtn.clear();
-ModalDialog::dispose();
+mxEnableBtn->connect_clicked(LINK(this, MacroWarning, EnableBtnHdl));
+mxDisableBtn->grab_focus(); // Default button, but focus is on view button
 }
 
 void MacroWarning::SetDocumentURL( const OUString& rDocURL )
 {
-mpDocNameFI->SetText( rDocURL );
+

[Libreoffice-commits] core.git: uui/inc

2018-03-16 Thread Caolán McNamara 
 uui/inc/strings.hrc |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 975a8164e05a437ec8b51a506989b0bd617854b8
Author: Caolán McNamara 
Date:   Fri Mar 16 13:47:00 2018 +

Related tdf#116264 trailing newlines used for msgbox padding now harmful

Change-Id: Ibe53f71514ffa7d5ca5728b742964f1ab4827692
Reviewed-on: https://gerrit.libreoffice.org/51427
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
index a47412520bca..22deb50f2837 100644
--- a/uui/inc/strings.hrc
+++ b/uui/inc/strings.hrc
@@ -31,10 +31,10 @@
 #define STR_PASSWORD_MISMATCH   NC_("STR_PASSWORD_MISMATCH", 
"The confirmation password did not match the password. Set the password again 
by entering the same password in both boxes.")
 
 #define STR_ALREADYOPEN_TITLE   NC_("STR_ALREADYOPEN_TITLE", 
"Document in Use")
-#define STR_ALREADYOPEN_MSG NC_("STR_ALREADYOPEN_MSG", 
"Document file '$(ARG1)' is locked for editing by yourself on a different 
system since $(ARG2)\n\nOpen document read-only, or ignore own file locking and 
open the document for editing.\n\n")
+#define STR_ALREADYOPEN_MSG NC_("STR_ALREADYOPEN_MSG", 
"Document file '$(ARG1)' is locked for editing by yourself on a different 
system since $(ARG2)\n\nOpen document read-only, or ignore own file locking and 
open the document for editing.")
 #define STR_ALREADYOPEN_READONLY_BTN
NC_("STR_ALREADYOPEN_READONLY_BTN", "Open ~Read-Only")
 #define STR_ALREADYOPEN_OPEN_BTN
NC_("STR_ALREADYOPEN_OPEN_BTN", "~Open")
-#define STR_ALREADYOPEN_SAVE_MSG
NC_("STR_ALREADYOPEN_SAVE_MSG", "Document file '$(ARG1)' is locked for editing 
by yourself on a different system since $(ARG2)\n\nClose document on other 
system and retry saving or ignore own file locking and save current 
document.\n\n")
+#define STR_ALREADYOPEN_SAVE_MSG
NC_("STR_ALREADYOPEN_SAVE_MSG", "Document file '$(ARG1)' is locked for editing 
by yourself on a different system since $(ARG2)\n\nClose document on other 
system and retry saving or ignore own file locking and save current document.")
 #define STR_ALREADYOPEN_RETRY_SAVE_BTN  
NC_("STR_ALREADYOPEN_RETRY_SAVE_BTN", "~Retry Saving")
 #define STR_ALREADYOPEN_SAVE_BTN
NC_("STR_ALREADYOPEN_SAVE_BTN", "~Save")
 
@@ -48,18 +48,18 @@
 
 #define STR_OPENLOCKED_TITLENC_("STR_OPENLOCKED_TITLE", 
"Document in Use")
 #define STR_OPENLOCKED_MSG  NC_("STR_OPENLOCKED_MSG", 
"Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nOpen document 
read-only or open a copy of the document for editing.\n\n$(ARG3)")
-#define STR_OPENLOCKED_ALLOWIGNORE_MSG  
NC_("STR_OPENLOCKED_ALLOWIGNORE_MSG", "You may also ignore the file locking and 
open the document for editing.\n\n")
+#define STR_OPENLOCKED_ALLOWIGNORE_MSG  
NC_("STR_OPENLOCKED_ALLOWIGNORE_MSG", "You may also ignore the file locking and 
open the document for editing.")
 #define STR_OPENLOCKED_OPENREADONLY_BTN 
NC_("STR_OPENLOCKED_OPENREADONLY_BTN", "Open ~Read-Only")
 #define STR_OPENLOCKED_OPENCOPY_BTN 
NC_("STR_OPENLOCKED_OPENCOPY_BTN", "Open ~Copy")
 #define STR_UNKNOWNUSER NC_("STR_UNKNOWNUSER", 
"Unknown User")
 
 #define STR_FILECHANGED_TITLE   NC_("STR_FILECHANGED_TITLE", 
"Document Has Been Changed by Others")
-#define STR_FILECHANGED_MSG NC_("STR_FILECHANGED_MSG", 
"The file has been changed since it was opened for editing in %PRODUCTNAME. 
Saving your version of the document will overwrite changes made by 
others.\n\nDo you want to save anyway?\n\n")
+#define STR_FILECHANGED_MSG NC_("STR_FILECHANGED_MSG", 
"The file has been changed since it was opened for editing in %PRODUCTNAME. 
Saving your version of the document will overwrite changes made by 
others.\n\nDo you want to save anyway?")
 #define STR_FILECHANGED_SAVEANYWAY_BTN  
NC_("STR_FILECHANGED_SAVEANYWAY_BTN", "~Save Anyway")
 
 #define STR_TRYLATER_TITLE  NC_("STR_TRYLATER_TITLE", 
"Document in Use")
-#define STR_TRYLATER_MSGNC_("STR_TRYLATER_MSG", 
"Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nTry again 
later to save document or save a copy of that document.\n\n")
-#define STR_OVERWRITE_IGNORELOCK_MSG
NC_("STR_OVERWRITE_IGNORELOCK_MSG", "Document file '$(ARG1)' is locked for 
editing by:\n\n$(ARG2)\n\nYou may try to ignore the file locking and overwrite 
the existing document.\n\n")
+#define STR_TRYLATER_MSGNC_("STR_TRYLATER_MSG", 
"Document file '$(ARG1)' is locked for editing by:\n\n$(ARG2)\n\nTry again 
later to save

[Libreoffice-commits] core.git: uui/inc uui/source

2017-08-19 Thread Noel Grandin 
 uui/inc/ids.hrc   |   22 ++---
 uui/inc/ids.hxx   |   15 ---
 uui/source/iahndl-ssl.cxx |   58 ++
 3 files changed, 36 insertions(+), 59 deletions(-)

New commits:
commit e947d11753e8d3a13a251ec99ce7129099dca1a1
Author: Noel Grandin 
Date:   Sat Aug 19 13:45:40 2017 +0200

remove dodgy use of ErrCode

that wasn't really an ErrCode, just a way to look up localised strings

Change-Id: Icd6a142edf0c3e04ac0b5ff968f231288ff8a950
Reviewed-on: https://gerrit.libreoffice.org/41323
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc
index 2156b63bd1b6..2cf45ebf 100644
--- a/uui/inc/ids.hrc
+++ b/uui/inc/ids.hrc
@@ -150,25 +150,19 @@ const std::pair RID_UUI_ERRHDL[] =
   ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_NOT_LOCKED) & ERRCODE_RES_MASK) },
 { NC_("RID_UUI_ERRHDL", "The previously obtained lock for file $(ARG1) has 
expired.\nThis can happen due to problems on the server managing the file lock. 
It cannot be guaranteed that write operations on this file will not overwrite 
changes done by other users!"),
   ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_LOCK_EXPIRED) & ERRCODE_RES_MASK) 
},
-{ NC_("RID_UUI_ERRHDL", "Unable to verify the identity of $(ARG1) 
site.\n\nBefore accepting this certificate, you should examine this site's 
certificate carefully. Are you willing to accept this certificate for the 
purpose of identifying the Web site $(ARG1)?"),
-  ErrCode(sal_uInt32(ERRCODE_UUI_UNKNOWNAUTH_UNTRUSTED)) },
-{ NC_("RID_UUI_ERRHDL", "$(ARG1) is a site that uses a security 
certificate to encrypt data during transmission, but its certificate expired on 
$(ARG2).\n\nYou should check to make sure that your computer's time is 
correct."),
-  ErrCode(sal_uInt32(ERRCODE_UUI_SSLWARN_EXPIRED_1)) },
-{ NC_("RID_UUI_ERRHDL", "You have attempted to establish a connection with 
$(ARG1). However, the security certificate presented belongs to $(ARG2). It is 
possible, though unlikely, that someone may be trying to intercept your 
communication with this web site.\n\nIf you suspect the certificate shown does 
not belong to $(ARG1), please cancel the connection and notify the site 
administrator.\n\nWould you like to continue anyway?"),
-  ErrCode(sal_uInt32(ERRCODE_UUI_SSLWARN_DOMAINMISMATCH_1)) },
-{ NC_("RID_UUI_ERRHDL", "The certificate could not be validated. You 
should examine this site's certificate carefully.\n\nIf you suspect the 
certificate shown, please cancel the connection and notify the site 
administrator."),
-  ErrCode(sal_uInt32(ERRCODE_UUI_SSLWARN_INVALID_1)) },
-{ NC_("RID_UUI_ERRHDL", "Security Warning: Domain Name Mismatch"),
-  ErrCode(TITLE_UUI_SSLWARN_DOMAINMISMATCH) },
-{ NC_("RID_UUI_ERRHDL", "Security Warning: Server Certificate Expired"),
-  ErrCode(TITLE_UUI_SSLWARN_EXPIRED) },
-{ NC_("RID_UUI_ERRHDL", "Security Warning: Server Certificate Invalid"),
-  ErrCode(TITLE_UUI_SSLWARN_INVALID) },
 { NC_("RID_UUI_ERRHDL", "Component cannot be loaded, possibly broken or 
incomplete installation.\nFull error message:\n\n $(ARG1)."),
   ErrCode(sal_uInt32(ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY) & 
ERRCODE_RES_MASK) },
 { nullptr, ERRCODE_NONE }
 };
 
+#define STR_UUI_UNKNOWNAUTH_UNTRUSTED
NC_("STR_UUI_UNKNOWNAUTH_UNTRUSTED", "Unable to verify the identity of $(ARG1) 
site.\n\nBefore accepting this certificate, you should examine this site's 
certificate carefully. Are you willing to accept this certificate for the 
purpose of identifying the Web site $(ARG1)?")
+#define STR_UUI_SSLWARN_EXPIRED  NC_("STR_UUI_SSLWARN_EXPIRED", 
"$(ARG1) is a site that uses a security certificate to encrypt data during 
transmission, but its certificate expired on $(ARG2).\n\nYou should check to 
make sure that your computer's time is correct.")
+#define STR_UUI_SSLWARN_EXPIRED_TITLE
NC_("STR_UUI_SSLWARN_EXPIRED_TITLE", "Security Warning: Server Certificate 
Invalid")
+#define STR_UUI_SSLWARN_DOMAINMISMATCH   
NC_("STR_UUI_SSLWARN_DOMAINMISMATCH", "You have attempted to establish a 
connection with $(ARG1). However, the security certificate presented belongs to 
$(ARG2). It is possible, though unlikely, that someone may be trying to 
intercept your communication with this web site.\n\nIf you suspect the 
certificate shown does not belong to $(ARG1), please cancel the connection and 
notify the site administrator.\n\nWould you like to continue anyway?")
+#define STR_UUI_SSLWARN_DOMAINMISMATCH_TITLE 
NC_("STR_UUI_SSLWARN_DOMAINMISMATCH_TITLE", "Security Warning: Server 
Certificate Expired")
+#define STR_UUI_SSLWARN_INVALID  NC_("STR_UUI_SSLWARN_INVALID", 
"The certificate could not be validated. You should examine this site's 
certificate carefully.\n\nIf you suspect the certificate