include/vcl/errinf.hxx | 15 +++++++++++++++
vcl/source/window/errinf.cxx | 15 ---------------
2 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 0c4d2767742d3a86a392eb328762d92050527cad
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Mon Apr 24 02:17:53 2017 +1000
vcl: move doxygen comment to header
Change-Id: I486843fc4b9da3fc5fc161e90768b0443530071a
Reviewed-on: https://gerrit.libreoffice.org/36859
Tested-by: Chris Sherlock <chris.sherloc...@gmail.com>
Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index e8bb5127da20..476bbb52ac41 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -118,6 +118,21 @@ public:
ErrorHandler();
virtual ~ErrorHandler();
+ /** Handles an error.
+
+ If nFlags is not set, the DynamicErrorInfo flags or the
+ resource flags will be used. Thus the order is:
+
+ 1. nFlags,
+ 2. Resource Flags
+ 3. Dynamic Flags
+ 4. Default ButtonsOk, MessageError
+
+ @param nErrCodeId error id
+ @param nFlags error flags.
+
+ @return what sort of dialog to use, with what buttons
+ */
static DialogMask HandleError(sal_uInt32 nId, DialogMask nMask =
DialogMask::MAX);
static bool GetErrorString(sal_uInt32 nId, OUString& rStr);
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index 4703e82325ae..d3b3ead2194e 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -112,21 +112,6 @@ bool ErrorHandler::GetErrorString(sal_uInt32 nErrCodeId,
OUString& rErrStr)
return false;
}
-/** Handles an error.
-
- If nFlags is not set, the DynamicErrorInfo flags or the
- resource flags will be used. Thus the order is:
-
- 1. nFlags,
- 2. Resource Flags
- 3. Dynamic Flags
- 4. Default ButtonsOk, MessageError
-
- @param nErrCodeId error id
- @param nFlags error flags.
-
- @return what sort of dialog to use, with what buttons
-*/
DialogMask ErrorHandler::HandleError(sal_uInt32 nErrCodeId, DialogMask nFlags)
{
if(nErrCodeId != ERRCODE_NONE || nErrCodeId == ERRCODE_ABORT)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
