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 /sdext/source/minimizer | |
| 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 'sdext/source/minimizer')
| -rw-r--r-- | sdext/source/minimizer/optimizerdialog.hrc | 30 | ||||
| -rw-r--r-- | sdext/source/minimizer/optimizerdialog.hxx | 6 |
2 files changed, 5 insertions, 31 deletions
diff --git a/sdext/source/minimizer/optimizerdialog.hrc b/sdext/source/minimizer/optimizerdialog.hrc deleted file mode 100644 index 809e11edd290..000000000000 --- a/sdext/source/minimizer/optimizerdialog.hrc +++ /dev/null @@ -1,30 +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 SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HRC -#define SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HRC - -#define ITEM_ID_INTRODUCTION 0 -#define ITEM_ID_SLIDES 1 -#define ITEM_ID_GRAPHIC_OPTIMIZATION 2 -#define ITEM_ID_OLE_OPTIMIZATION 3 -#define ITEM_ID_SUMMARY 4 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 3e33c10f8409..7fa161e3b5f4 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HXX #define INCLUDED_SDEXT_SOURCE_MINIMIZER_OPTIMIZERDIALOG_HXX -#include "optimizerdialog.hrc" #include <vector> #include "unodialog.hxx" #include "optimizationstats.hxx" @@ -51,6 +50,11 @@ #define PAGE_POS_Y 8 #define PAGE_WIDTH OD_DIALOG_WIDTH - PAGE_POS_X +#define ITEM_ID_INTRODUCTION 0 +#define ITEM_ID_SLIDES 1 +#define ITEM_ID_GRAPHIC_OPTIMIZATION 2 +#define ITEM_ID_OLE_OPTIMIZATION 3 +#define ITEM_ID_SUMMARY 4 class OptimizerDialog : public UnoDialog, public ConfigurationAccess { |