diff options
| -rw-r--r-- | sw/AllLangResTarget_sw.mk | 3 | ||||
| -rw-r--r-- | sw/source/ui/app/app.src | 15 | ||||
| -rw-r--r-- | sw/source/ui/misc/srtdlg.src | 29 | ||||
| -rw-r--r-- | sw/source/ui/table/table.src | 26 | ||||
| -rw-r--r-- | sw/source/ui/table/tabledlg.src | 27 | ||||
| -rw-r--r-- | sw/source/uibase/inc/app.hrc | 5 | ||||
| -rw-r--r-- | sw/source/uibase/inc/misc.hrc | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/table.hrc | 6 |
8 files changed, 20 insertions, 93 deletions
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 1fd4a171fe86..c4c7780dd953 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -107,13 +107,10 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/index/idxmrk.src \ sw/source/ui/misc/glossary.src \ sw/source/ui/misc/numberingtypelistbox.src \ - sw/source/ui/misc/srtdlg.src \ sw/source/ui/misc/swruler.src \ sw/source/ui/ribbar/tbxanchr.src \ sw/source/ui/shells/shells.src \ sw/source/ui/sidebar/PagePropertyPanel.src \ - sw/source/ui/table/table.src \ - sw/source/ui/table/tabledlg.src \ sw/source/ui/utlui/poolfmt.src \ sw/source/ui/utlui/utlui.src \ sw/source/ui/web/web.src \ diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index c4a86bae82ce..e8f7b7129bb5 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -720,4 +720,19 @@ String STR_CAPTION_OLE Text [ en-US ] = "Other OLE Objects"; }; +String STR_WRONG_TABLENAME +{ + Text [ en-US ] = "The name of the table must not contain spaces." ; +}; + +String STR_ERR_TABLE_MERGE +{ + Text [ en-US ] = "Selected table cells are too complex to merge." ; +}; + +String STR_SRTERR +{ + Text [ en-US ] = "Cannot sort selection" ; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src deleted file mode 100644 index 82ea0dc570f5..000000000000 --- a/sw/source/ui/misc/srtdlg.src +++ /dev/null @@ -1,29 +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 . - */ - -#include "misc.hrc" -#include "cmdid.h" -#include "helpid.h" - -String STR_SRTERR -{ - Text [ en-US ] = "Cannot sort selection" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/table/table.src b/sw/source/ui/table/table.src deleted file mode 100644 index a81454be47bb..000000000000 --- a/sw/source/ui/table/table.src +++ /dev/null @@ -1,26 +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 . - */ - -#include "table.hrc" -String STR_ERR_TABLE_MERGE -{ - Text [ en-US ] = "Selected table cells are too complex to merge." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src deleted file mode 100644 index af7f01f43d8c..000000000000 --- a/sw/source/ui/table/tabledlg.src +++ /dev/null @@ -1,27 +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 . - */ - -#include "table.hrc" - -String STR_WRONG_TABLENAME -{ - Text [ en-US ] = "The name of the table must not contain spaces." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc index 95cf3a9dd2ff..5ffc2dc7fd44 100644 --- a/sw/source/uibase/inc/app.hrc +++ b/sw/source/uibase/inc/app.hrc @@ -103,8 +103,11 @@ #define STR_CAPTION_FRAME (RC_APP_BEGIN + 134) #define STR_CAPTION_GRAPHIC (RC_APP_BEGIN + 135) #define STR_CAPTION_OLE (RC_APP_BEGIN + 136) +#define STR_ERR_TABLE_MERGE (RC_APP_BEGIN + 137) +#define STR_WRONG_TABLENAME (RC_APP_BEGIN + 138) +#define STR_SRTERR (RC_APP_BEGIN + 139) -#define APP_ACT_END STR_CAPTION_OLE +#define APP_ACT_END STR_SRTERR #if APP_ACT_END > RC_APP_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc index eb553dc459b1..01e1e3d16787 100644 --- a/sw/source/uibase/inc/misc.hrc +++ b/sw/source/uibase/inc/misc.hrc @@ -34,8 +34,6 @@ #define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33) #define STR_NO_GLOSSARIES (RC_MISC_BEGIN + 34) -#define STR_SRTERR (RC_MISC_BEGIN + 42) - #define STR_GLOSSARY (RC_MISC_BEGIN + 43) #define STR_CHANGE_START (RC_MISC_BEGIN + 44) #define STR_CHANGE_END (RC_MISC_BEGIN + 45) diff --git a/sw/source/uibase/inc/table.hrc b/sw/source/uibase/inc/table.hrc index d01c9920b538..cdd17a4bd855 100644 --- a/sw/source/uibase/inc/table.hrc +++ b/sw/source/uibase/inc/table.hrc @@ -21,11 +21,7 @@ #define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4) -#define STR_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7) - -#define STR_WRONG_TABLENAME (RC_TABLE_BEGIN + 13) - -#define TABLE_ACT_END STR_WRONG_TABLENAME +#define TABLE_ACT_END DLG_ROW_HEIGHT #if TABLE_ACT_END > RC_TABLE_END #error Resource-Id Ueberlauf in #file, #line |