diff options
-rwxr-xr-x | bin/find-unused-defines-in-hrc-files.py | 2 | ||||
-rw-r--r-- | include/svx/dialogs.hrc | 10 | ||||
-rw-r--r-- | include/svx/svxids.hrc | 4 | ||||
-rw-r--r-- | svx/inc/float3d.hrc | 10 | ||||
-rw-r--r-- | svx/inc/fmhelp.hrc | 1 | ||||
-rw-r--r-- | svx/inc/helpid.hrc | 3 | ||||
-rw-r--r-- | svx/source/dialog/docrecovery.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/docrecovery.hrc | 47 | ||||
-rw-r--r-- | svx/source/dialog/docrecovery.src | 2 | ||||
-rw-r--r-- | svx/source/dialog/sdstring.src | 34 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.src | 5 |
11 files changed, 4 insertions, 118 deletions
diff --git a/bin/find-unused-defines-in-hrc-files.py b/bin/find-unused-defines-in-hrc-files.py index b945266351b6..488b045340e5 100755 --- a/bin/find-unused-defines-in-hrc-files.py +++ b/bin/find-unused-defines-in-hrc-files.py @@ -146,6 +146,8 @@ with a.stdout as txt: if "reportdesign/" in line2 and idName.startswith("HID_RPT_PROP_"): found_reason_to_exclude = True if "reportdesign/" in line2 and idName.startswith("RID_STR_"): found_reason_to_exclude = True if "forms/" in line2 and idName.startswith("PROPERTY_"): found_reason_to_exclude = True + if "svx/source/tbxctrls/extrusioncontrols.hrc:" in line2 and idName.startswith("DIRECTION_"): found_reason_to_exclude = True + if "svx/source/tbxctrls/extrusioncontrols.hrc:" in line2 and idName.startswith("FROM_"): found_reason_to_exclude = True # if we see more than 2 lines then it's probably one of the BASE/START/BEGIN things cnt = cnt + 2 if cnt > 3: found_reason_to_exclude = True diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 3ae2db064bea..214e0d48d7e1 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -363,15 +363,6 @@ #define RID_SVXSTR_GRAFMODE_MONO (RID_SVX_START + 522) #define RID_SVXSTR_GRAFMODE_WATERMARK (RID_SVX_START + 523) -// Strings for Plugin-Filedialog -#define STR_INSERT_VIDEO_EXTFILTER_IVF (RID_SVX_START + 524) -#define STR_INSERT_VIDEO_EXTFILTER_AVI (RID_SVX_START + 525) -#define STR_INSERT_VIDEO_EXTFILTER_MOV (RID_SVX_START + 526) -#define STR_INSERT_VIDEO_EXTFILTER_MPEG (RID_SVX_START + 527) -#define STR_EXTFILTER_ALL (RID_SVX_START + 528) -#define STR_INSERT_SOUND_TITLE (RID_SVX_START + 529) -#define STR_INSERT_VIDEO_TITLE (RID_SVX_START + 530) - #define RID_SVXBMP_WIRE_FRAME (RID_SVX_START + 532) #define RID_SVXBMP_MATTE (RID_SVX_START + 533) #define RID_SVXBMP_PLASTIC (RID_SVX_START + 534) @@ -955,7 +946,6 @@ // sidebar-related resources #define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1242) -#define BMP_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0) #define BMP_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1) #define BMP_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21) #define BMP_WIDTH1_ICON (RID_SVX_SIDEBAR_BEGIN + 22) diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 79eef2acf4c1..d95368c5ed3f 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -38,11 +38,8 @@ #define MID_INTER_SPACE 0x37 #define MID_LOWER 0x3d -#define MID_POS 0x43 #define MID_RIGHT 0x46 -#define MID_SIZE 0x4a #define MID_UPPER 0x4b -#define MID_USExxx 0x4c #define MID_HLINK_NAME 0x6f #define MID_HLINK_URL 0x70 @@ -129,7 +126,6 @@ #define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 ) #define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 ) #define SID_BASICIDE_NEWJAVAMODULE ( SID_BASICIDE_START + 41 ) -#define SID_BASICIDE_IMAGESTART ( SID_BASICIDE_START + 50 ) #define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862) // StarBase-Id's diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc index 7007bdead91a..6d1eeceeff04 100644 --- a/svx/inc/float3d.hrc +++ b/svx/inc/float3d.hrc @@ -18,23 +18,14 @@ */ #include <svx/dialogs.hrc> -#define BTN_GEO 2 -#define BTN_LIGHT 4 - // Unterer Teil #define CTL_PREVIEW 12 #define CTL_LIGHT_PREVIEW 13 // Geometry -#define FT_DEPTH 35 -#define MTR_DEPTH 36 // Depiction/Appearance -#define FT_SLANT 48 -#define MTR_SLANT 49 -#define FL_SHADOW 50 #define FT_DISTANCE 51 -#define FL_CAMERA 55 // Lighting #define BTN_LIGHT_1 60 @@ -49,6 +40,5 @@ #define LB_AMBIENTLIGHT 78 #define BTN_AMBIENT_COLOR 79 #define FT_AMBIENTLIGHT 80 -#define FL_LIGHT 81 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 1d4155eab99c..8cc34fcb29f0 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -33,7 +33,6 @@ #define HID_GRID_TRAVEL_NEW "SVX_HID_GRID_TRAVEL_NEW" #define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE" #define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS" -#define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS" #define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD" #define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" #define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 276ec15ec105..7c9f9838f098 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -29,9 +29,6 @@ #define HID_CTRL3D_SWITCHER "SVX_HID_CTRL3D_SWITCHER" #define HID_CTRL3D_VSCROLL "SVX_HID_CTRL3D_VSCROLL" #define HID_CTRL_COLOR "SVX_HID_CTRL_COLOR" -#define HID_EDITENG_SPELLER_ADDWORD "SVX_HID_EDITENG_SPELLER_ADDWORD" -#define HID_EDITENG_SPELLER_AUTOCORRECT "SVX_HID_EDITENG_SPELLER_AUTOCORRECT" -#define HID_EDITENG_SPELLER_IGNORE "SVX_HID_EDITENG_SPELLER_IGNORE" #define HID_EDITENG_SPELLER_PARALANGUAGE "SVX_HID_EDITENG_SPELLER_PARALANGUAGE" #define HID_EDITENG_SPELLER_START "SVX_HID_EDITENG_SPELLER_START" #define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE" diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 8e45a9390cae..e76dbcfeb8f8 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -24,7 +24,6 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include "docrecovery.hxx" -#include "docrecovery.hrc" #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -854,8 +853,9 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore) get(m_pNextBtn, "next"); get(m_pCancelBtn, "cancel"); + constexpr int RECOV_CONTROLWIDTH = 278; SvSimpleTableContainer* pFileListLBContainer = get<SvSimpleTableContainer>("filelist"); - Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, RECOV_FILELISTHEIGHT), MapUnit::MapAppFont)); + Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, 68), MapUnit::MapAppFont)); pFileListLBContainer->set_height_request(aSize.Height()); m_pFileListLB = VclPtr<RecovDocList>::Create(*pFileListLBContainer, DIALOG_MGR()); diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc deleted file mode 100644 index cb4bf249e356..000000000000 --- a/svx/source/dialog/docrecovery.hrc +++ /dev/null @@ -1,47 +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_SVX_SOURCE_DIALOG_DOCRECOVERY_HRC -#define INCLUDED_SVX_SOURCE_DIALOG_DOCRECOVERY_HRC - -#include <svtools/controldims.hrc> - -// general - -#define PROGR_HEIGHT (RSC_CD_PUSHBUTTON_HEIGHT) - -#define RECOV_HEIGHT 238 -#define RECOV_TITLEWINHEIGHT 36 -#define RECOV_DESCRHEIGHT 6*RSC_BS_CHARHEIGHT -#define RECOV_ROW1 (RECOV_TITLEWINHEIGHT) -#define RECOV_ROW2 (RECOV_ROW1+7) -#define RECOV_ROW3 (RECOV_ROW2+RECOV_DESCRHEIGHT+RSC_SP_CTRL_DESC_Y) -#define RECOV_ROW4 (RECOV_ROW3+RSC_BS_CHARHEIGHT+RSC_SP_CTRL_DESC_Y) -#define RECOV_ROW5 (RECOV_ROW4+PROGR_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define RECOV_ROW6 (RECOV_ROW5+RSC_BS_CHARHEIGHT+RSC_SP_CTRL_DESC_Y) -#define RECOV_ROW10 (RECOV_HEIGHT-6) -#define RECOV_ROW9 (RECOV_ROW10-RSC_CD_PUSHBUTTON_HEIGHT) -#define RECOV_ROW8 (RECOV_ROW9-RSC_SP_CTRL_GROUP_Y-RSC_BS_CHARHEIGHT) -#define RECOV_ROW7 (RECOV_ROW8-RSC_SP_CTRL_GROUP_Y) -#define RECOV_FILELISTHEIGHT (RECOV_ROW7-RECOV_ROW6) -#define RECOV_CONTROLWIDTH (290-6-RSC_SP_DLG_INNERBORDER_LEFT) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src index 8f8cd98fa368..db0aa574e854 100644 --- a/svx/source/dialog/docrecovery.src +++ b/svx/source/dialog/docrecovery.src @@ -20,8 +20,6 @@ #include <svx/dialogs.hrc> #include "helpid.hrc" -#include "docrecovery.hrc" - String RID_SVXSTR_QUERY_EXIT_RECOVERY { Text [ en-US ] = "Are you sure you want to discard the %PRODUCTNAME document recovery data?"; diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 9ec239d64216..4c9547385269 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -154,40 +154,6 @@ String RID_SVXSTR_GRAFMODE_WATERMARK { Text [ en-US ] = "Watermark"; }; -String STR_INSERT_VIDEO_EXTFILTER_IVF -{ - Text [ en-US ] = "Intel Indeo Video (*.ivf)" ; -}; - -String STR_INSERT_VIDEO_EXTFILTER_AVI -{ - Text [ en-US ] = "Video for Windows (*.avi)" ; -}; - -String STR_INSERT_VIDEO_EXTFILTER_MOV -{ - Text [ en-US ] = "QuickTime Movie (*.mov)" ; -}; - -String STR_INSERT_VIDEO_EXTFILTER_MPEG -{ - Text [ en-US ] = "MPEG - Motion Pictures Experts Group (*.mpe;*.mpeg;*.mpg)" ; -}; - -String STR_EXTFILTER_ALL -{ - Text [ en-US ] = "<All>" ; -}; - -String STR_INSERT_SOUND_TITLE -{ - Text [ en-US ] = "Insert audio" ; -}; - -String STR_INSERT_VIDEO_TITLE -{ - Text [ en-US ] = "Insert video" ; -}; // BM: some additional standard colors diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src index 65558ecd2d32..854b376894b2 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src @@ -20,11 +20,6 @@ #include "helpid.hrc" #include <svx/dialogs.hrc> -Bitmap BMP_SPACE3 -{ - File = "symphony/spacing3.png"; -}; - Bitmap BMP_INDENT_HANG { File = "symphony/Indent_Hanging.png"; |