summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorVincent LE GARREC <libreoffice@le-garrec.fr>2021-03-06 08:28:23 +0100
committerIlmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>2021-03-23 10:54:09 +0100
commit1c0c2bb7920f5da7562a053019514d1e4cbdf1f6 (patch)
treed4dd124d4dbc0b12703b12d4eb945d11c063c297 /uui
parent039e90ec011157c9e851221a53ec62d33acb71d1 (diff)
tdf#124176 Use pragma once in u*
ucb, uno*, uui Change-Id: Ic4b6d541eb0df8bf7bceddf178ebb5177ad2b87b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112046 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'uui')
-rw-r--r--uui/inc/ids.hrc5
-rw-r--r--uui/inc/ids.hxx5
-rw-r--r--uui/inc/strings.hrc5
-rw-r--r--uui/source/alreadyopen.hxx5
-rw-r--r--uui/source/authfallbackdlg.hxx5
-rw-r--r--uui/source/filechanged.hxx5
-rw-r--r--uui/source/fltdlg.hxx5
-rw-r--r--uui/source/getcontinuations.hxx5
-rw-r--r--uui/source/iahndl.hxx5
-rw-r--r--uui/source/lockcorrupt.hxx5
-rw-r--r--uui/source/lockfailed.hxx5
-rw-r--r--uui/source/logindlg.hxx5
-rw-r--r--uui/source/loginerr.hxx5
-rw-r--r--uui/source/masterpasscrtdlg.hxx5
-rw-r--r--uui/source/masterpassworddlg.hxx5
-rw-r--r--uui/source/nameclashdlg.hxx5
-rw-r--r--uui/source/openlocked.hxx5
-rw-r--r--uui/source/passwordcontainer.hxx5
-rw-r--r--uui/source/passworddlg.hxx5
-rw-r--r--uui/source/requeststringresolver.hxx5
-rw-r--r--uui/source/secmacrowarnings.hxx5
-rw-r--r--uui/source/sslwarndlg.hxx5
-rw-r--r--uui/source/trylater.hxx5
-rw-r--r--uui/source/unknownauthdlg.hxx5
24 files changed, 24 insertions, 96 deletions
diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc
index 744542bf7697..6ab1882b3611 100644
--- a/uui/inc/ids.hrc
+++ b/uui/inc/ids.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_INC_IDS_HRC
-#define INCLUDED_UUI_INC_IDS_HRC
+#pragma once
#include <vcl/errcode.hxx>
@@ -171,6 +170,4 @@ const std::pair<const char*, ErrCode> RID_UUI_ERRHDL[] =
#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 shown, please cancel the connection and notify the site administrator.")
#define STR_UUI_SSLWARN_INVALID_TITLE NC_("STR_UUI_SSLWARN_INVALID_TITLE", "Security Warning: Domain Name Mismatch")
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/inc/ids.hxx b/uui/inc/ids.hxx
index 71beff973f02..32ba356a4ee5 100644
--- a/uui/inc/ids.hxx
+++ b/uui/inc/ids.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_INC_IDS_HXX
-#define INCLUDED_UUI_INC_IDS_HXX
+#pragma once
#include <vcl/errcode.hxx>
@@ -88,6 +87,4 @@
#define ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY ErrCode(ErrCodeArea::Uui, 63)
#define ERRCODE_UUI_IO_EXOTICFILEFORMAT ErrCode(ErrCodeArea::Uui, 64)
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/inc/strings.hrc b/uui/inc/strings.hrc
index ed2d00550273..364175298db7 100644
--- a/uui/inc/strings.hrc
+++ b/uui/inc/strings.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_INC_STRINGS_HRC
-#define INCLUDED_UUI_INC_STRINGS_HRC
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
@@ -77,6 +76,4 @@
#define STR_LOCKCORRUPT_MSG NC_("STR_LOCKCORRUPT_MSG", "The lock file is corrupted and probably empty. Opening the document read-only and closing it again removes the corrupted lock file.")
#define STR_LOCKCORRUPT_OPENREADONLY_BTN NC_("STR_LOCKCORRUPT_OPENREADONLY_BTN", "Open ~Read-Only")
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx
index 685214fb1a5e..b095f7ee58db 100644
--- a/uui/source/alreadyopen.hxx
+++ b/uui/source/alreadyopen.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_ALREADYOPEN_HXX
-#define INCLUDED_UUI_SOURCE_ALREADYOPEN_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -32,6 +31,4 @@ public:
short run() { return m_xQueryBox->run(); }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx
index b3482f70e85f..cd2f85247f35 100644
--- a/uui/source/authfallbackdlg.hxx
+++ b/uui/source/authfallbackdlg.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SVTOOLS_AUTHFALLBACKDLG_HXX
-#define INCLUDED_SVTOOLS_AUTHFALLBACKDLG_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -36,5 +35,3 @@ private:
DECL_LINK(OKHdl, weld::Button&, void);
DECL_LINK(CancelHdl, weld::Button&, void);
};
-
-#endif // INCLUDED_SVTOOLS_AUTHFALLBACKDLG_HXX
diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx
index f68b793e997a..66ead034738a 100644
--- a/uui/source/filechanged.hxx
+++ b/uui/source/filechanged.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_FILECHANGED_HXX
-#define INCLUDED_UUI_SOURCE_FILECHANGED_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -31,6 +30,4 @@ public:
short run() { return m_xQueryBox->run(); }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index 5f788073c41c..a0d829820cb6 100644
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_FLTDLG_HXX
-#define INCLUDED_UUI_SOURCE_FLTDLG_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -59,6 +58,4 @@ class FilterDialog : public weld::GenericDialogController
} // namespace uui
-#endif // INCLUDED_UUI_SOURCE_FLTDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx
index 6ea1f55fa067..4d22d8736e17 100644
--- a/uui/source/getcontinuations.hxx
+++ b/uui/source/getcontinuations.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_GETCONTINUATIONS_HXX
-#define INCLUDED_UUI_SOURCE_GETCONTINUATIONS_HXX
+#pragma once
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -100,6 +99,4 @@ void getContinuations(
}
}
-#endif // INCLUDED_UUI_SOURCE_GETCONTINUATIONS_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index b1ffb347a23f..ff6973245dad 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_IAHNDL_HXX
-#define INCLUDED_UUI_SOURCE_IAHNDL_HXX
+#pragma once
#include <rtl/ustring.hxx>
@@ -257,6 +256,4 @@ public:
bool getString(ErrCode nErrorCode, OUString &rString) const;
};
-#endif // INCLUDED_UUI_SOURCE_IAHNDL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/lockcorrupt.hxx b/uui/source/lockcorrupt.hxx
index 146757f2708e..1ca51c3faec5 100644
--- a/uui/source/lockcorrupt.hxx
+++ b/uui/source/lockcorrupt.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_LOCKCORRUPT_HXX
-#define INCLUDED_UUI_SOURCE_LOCKCORRUPT_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -31,6 +30,4 @@ public:
short run() { return m_xQueryBox->run(); }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx
index d7c4c11f313c..8351e8b631b6 100644
--- a/uui/source/lockfailed.hxx
+++ b/uui/source/lockfailed.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_LOCKFAILED_HXX
-#define INCLUDED_UUI_SOURCE_LOCKFAILED_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -31,6 +30,4 @@ public:
short run() { return m_xQueryBox->run(); }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index ff799f4501ff..0b3d57f1d885 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_LOGINDLG_HXX
-#define INCLUDED_UUI_SOURCE_LOGINDLG_HXX
+#pragma once
#include <vcl/weld.hxx>
#include <o3tl/typed_flags_set.hxx>
@@ -82,6 +81,4 @@ public:
};
-#endif // INCLUDED_UUI_SOURCE_LOGINDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index f0dd879e455b..fb8f17a8228d 100644
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_LOGINERR_HXX
-#define INCLUDED_UUI_SOURCE_LOGINERR_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <vcl/errinf.hxx>
@@ -155,7 +154,5 @@ inline void LoginErrorInfo::SetModifyUserName( bool bSet )
m_nFlags &= ~LOGINERROR_FLAG_MODIFY_USER_NAME;
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index c19ecb23e194..a8695fc1ed27 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_MASTERPASSCRTDLG_HXX
-#define INCLUDED_UUI_SOURCE_MASTERPASSCRTDLG_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -41,6 +40,4 @@ public:
OUString GetMasterPassword() const { return m_xEDMasterPasswordCrt->get_text(); }
};
-#endif // INCLUDED_UUI_SOURCE_MASTERPASSCRTDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index bbe67558ea6f..26f6ebb9ee85 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX
-#define INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX
+#pragma once
#include <com/sun/star/task/PasswordRequestMode.hpp>
#include <vcl/weld.hxx>
@@ -39,6 +38,4 @@ public:
OUString GetMasterPassword() const { return m_xEDMasterPassword->get_text(); }
};
-#endif // INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx
index 39d9af835f58..eac673b3e784 100644
--- a/uui/source/nameclashdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_NAMECLASHDLG_HXX
-#define INCLUDED_UUI_SOURCE_NAMECLASHDLG_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -47,6 +46,4 @@ public:
const OUString& getNewName() const { return m_aNewName; }
};
-#endif // UUI_COOKIEDG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx
index 7fdcd49ac591..178269a62b35 100644
--- a/uui/source/openlocked.hxx
+++ b/uui/source/openlocked.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_OPENLOCKED_HXX
-#define INCLUDED_UUI_SOURCE_OPENLOCKED_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -32,6 +31,4 @@ public:
short run() { return m_xQueryBox->run(); }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index cb4d5a533507..a18951161a80 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_PASSWORDCONTAINER_HXX
-#define INCLUDED_UUI_SOURCE_PASSWORDCONTAINER_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
@@ -156,6 +155,4 @@ private:
} // namespace uui
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 2f9c21b71f39..c21c4c3ba82f 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX
-#define INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX
+#pragma once
#include <com/sun/star/task/PasswordRequestMode.hpp>
#include <vcl/weld.hxx>
@@ -44,6 +43,4 @@ public:
OUString GetPassword() const { return m_xEDPassword->get_text(); }
};
-#endif // INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 27a94e6ba299..685a18038c86 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
-#define INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
+#pragma once
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/task/XInteractionRequestStringResolver.hpp>
@@ -58,6 +57,4 @@ private:
const css::uno::Reference< css::task::XInteractionRequest >& Request ) override;
};
-#endif // INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index b91cc092c708..71660fe7d0ff 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_SECMACROWARNINGS_HXX
-#define INCLUDED_UUI_SOURCE_SECMACROWARNINGS_HXX
+#pragma once
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/security/DocumentSignatureInformation.hpp>
@@ -65,6 +64,4 @@ public:
void SetCertificate( const css::uno::Reference< css::security::XCertificate >& _rxCert );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 070379624941..2762be4613a9 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_SSLWARNDLG_HXX
-#define INCLUDED_UUI_SOURCE_SSLWARNDLG_HXX
+#pragma once
#include <vcl/weld.hxx>
#include <com/sun/star/security/XCertificate.hpp>
@@ -42,6 +41,4 @@ public:
void setDescription1Text(const OUString& rText) { m_xDialog->set_primary_text(rText); }
};
-#endif // INCLUDED_UUI_SOURCE_SSLWARNDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx
index 8d1fbe62fd05..4f449dfacebe 100644
--- a/uui/source/trylater.hxx
+++ b/uui/source/trylater.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_TRYLATER_HXX
-#define INCLUDED_UUI_SOURCE_TRYLATER_HXX
+#pragma once
#include <vcl/weld.hxx>
@@ -32,6 +31,4 @@ public:
short run() { return m_xQueryBox->run(); }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 43e5b062e312..6c51ec4ebd3e 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UUI_SOURCE_UNKNOWNAUTHDLG_HXX
-#define INCLUDED_UUI_SOURCE_UNKNOWNAUTHDLG_HXX
+#pragma once
#include <vcl/weld.hxx>
#include <com/sun/star/security/XCertificate.hpp>
@@ -51,6 +50,4 @@ public:
}
};
-#endif // INCLUDED_UUI_SOURCE_UNKNOWNAUTHDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */