diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-16 15:05:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:51 +0100 |
| commit | 182a74d937088f0f08850014a7b918719e106b7d (patch) | |
| tree | 0a286f4a6a5adcd32fd32a26b61b247d247c93d2 /svtools/source/dialogs | |
| parent | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (diff) | |
de-hrc various things
e.g. helpid[s].hrc -> helpids.h
and insert include guards where missing
move "ordinary" defines into .hxx files
remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead
Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
Diffstat (limited to 'svtools/source/dialogs')
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.hrc | 28 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 2 |
3 files changed, 2 insertions, 31 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 3de2fc529302..6046e44b8c37 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -20,9 +20,8 @@ #include <memory> #include <svtools/addresstemplate.hxx> -#include "addresstemplate.hrc" #include <svtools/strings.hrc> -#include <svtools/helpid.hrc> +#include <svtools/helpids.h> #include <svtools/svtresid.hxx> #include <tools/debug.hxx> #include <comphelper/interaction.hxx> diff --git a/svtools/source/dialogs/addresstemplate.hrc b/svtools/source/dialogs/addresstemplate.hrc deleted file mode 100644 index 4fa3059c998d..000000000000 --- a/svtools/source/dialogs/addresstemplate.hrc +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * 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_SVTOOLS_SOURCE_DIALOGS_ADDRESSTEMPLATE_HRC -#define INCLUDED_SVTOOLS_SOURCE_DIALOGS_ADDRESSTEMPLATE_HRC - -#define FIELD_PAIRS_VISIBLE 5 -#define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 3317f5d81651..57ad496aab1f 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -18,7 +18,7 @@ */ #include <svtools/wizardmachine.hxx> -#include <svtools/helpid.hrc> +#include <svtools/helpids.h> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> |