diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-11 20:56:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:50 +0100 |
| commit | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch) | |
| tree | fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /sd/source/ui | |
| parent | fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff) | |
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
results in inserting the english original so something can be found, now the
standard fallback of using the english original from the source key is used, so
partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
com::sun::star::resource::OfficeResourceLoader
com::sun::star::resource::XResourceBundleLoader
com::sun::star::resource::XResourceBundle
when translating strings via uno apis
com.sun.star.resource.StringResourceWithLocation
can continue to be used
Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'sd/source/ui')
142 files changed, 279 insertions, 2831 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 41380c4dc93b..48d8bdc45081 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -52,7 +52,7 @@ #include "slideshow.hxx" #include "anminfo.hxx" -#include "accessibility.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include <osl/mutex.hxx> diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 22b7d7752cdd..d54a3cab4dbb 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -44,7 +44,7 @@ #include "AccessibleOutlineView.hxx" #include "AccessibleOutlineEditSource.hxx" #include <drawdoc.hxx> -#include "accessibility.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include <memory> diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 410b3cd2e664..45c7f78799ea 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -21,7 +21,7 @@ #include "SdShapeTypes.hxx" -#include "accessibility.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include <svx/DescriptionGenerator.hxx> #include <rtl/ustring.h> diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index de850ce3564d..bdac0a469ece 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -41,7 +41,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include "glob.hrc" +#include "strings.hrc" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 87341404435d..5fac67cbb8c3 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -35,7 +35,7 @@ #include "drawdoc.hxx" #include "sdresid.hxx" -#include "accessibility.hrc" +#include "strings.hrc" #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc deleted file mode 100644 index b14413af5c27..000000000000 --- a/sd/source/ui/accessibility/accessibility.hrc +++ /dev/null @@ -1,80 +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_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC -#define INCLUDED_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC - -#include <sfx2/sfx.hrc> - -#define SID_SD_A11Y_START (SID_SD_START+600) - -#define SID_SD_A11Y_D_DRAWVIEW_N (SID_SD_A11Y_START + 0) -#define SID_SD_A11Y_D_DRAWVIEW_D (SID_SD_A11Y_START + 1) - -#define SID_SD_A11Y_I_DRAWVIEW_N (SID_SD_A11Y_START + 2) -#define SID_SD_A11Y_I_DRAWVIEW_D (SID_SD_A11Y_START + 3) -#define SID_SD_A11Y_I_OUTLINEVIEW_N (SID_SD_A11Y_START + 4) -#define SID_SD_A11Y_I_OUTLINEVIEW_D (SID_SD_A11Y_START + 5) -#define SID_SD_A11Y_I_SLIDEVIEW_N (SID_SD_A11Y_START + 6) -#define SID_SD_A11Y_I_SLIDEVIEW_D (SID_SD_A11Y_START + 7) -#define SID_SD_A11Y_I_NOTESVIEW_N (SID_SD_A11Y_START + 8) -#define SID_SD_A11Y_I_NOTESVIEW_D (SID_SD_A11Y_START + 9) -#define SID_SD_A11Y_I_HANDOUTVIEW_N (SID_SD_A11Y_START + 10) -#define SID_SD_A11Y_I_HANDOUTVIEW_D (SID_SD_A11Y_START + 11) - -#define SID_SD_A11Y_P_TITLE_N (SID_SD_A11Y_START + 12) -#define SID_SD_A11Y_P_TITLE_D (SID_SD_A11Y_START + 13) -#define SID_SD_A11Y_P_OUTLINER_N (SID_SD_A11Y_START + 14) -#define SID_SD_A11Y_P_OUTLINER_D (SID_SD_A11Y_START + 15) -#define SID_SD_A11Y_P_SUBTITLE_N (SID_SD_A11Y_START + 16) -#define SID_SD_A11Y_P_SUBTITLE_D (SID_SD_A11Y_START + 17) -#define SID_SD_A11Y_P_PAGE_N (SID_SD_A11Y_START + 18) -#define SID_SD_A11Y_P_PAGE_D (SID_SD_A11Y_START + 19) -#define SID_SD_A11Y_P_NOTES_N (SID_SD_A11Y_START + 20) -#define SID_SD_A11Y_P_NOTES_D (SID_SD_A11Y_START + 21) -#define SID_SD_A11Y_P_HANDOUT_N (SID_SD_A11Y_START + 22) -#define SID_SD_A11Y_P_HANDOUT_D (SID_SD_A11Y_START + 23) -#define SID_SD_A11Y_P_UNKNOWN_N (SID_SD_A11Y_START + 24) -#define SID_SD_A11Y_P_UNKNOWN_D (SID_SD_A11Y_START + 25) -#define SID_SD_A11Y_P_FOOTER_N (SID_SD_A11Y_START + 26) -#define SID_SD_A11Y_P_FOOTER_D (SID_SD_A11Y_START + 27) -#define SID_SD_A11Y_P_HEADER_N (SID_SD_A11Y_START + 28) -#define SID_SD_A11Y_P_HEADER_D (SID_SD_A11Y_START + 29) -#define SID_SD_A11Y_P_DATE_N (SID_SD_A11Y_START + 30) -#define SID_SD_A11Y_P_DATE_D (SID_SD_A11Y_START + 31) -#define SID_SD_A11Y_P_NUMBER_N (SID_SD_A11Y_START + 32) -#define SID_SD_A11Y_P_NUMBER_D (SID_SD_A11Y_START + 33) -#define SID_SD_A11Y_D_PRESENTATION (SID_SD_A11Y_START + 34) -#define SID_SD_A11Y_P_TITLE_N_STYLE (SID_SD_A11Y_START + 35) -#define SID_SD_A11Y_P_OUTLINER_N_STYLE (SID_SD_A11Y_START + 36) -#define SID_SD_A11Y_P_SUBTITLE_N_STYLE (SID_SD_A11Y_START + 37) -#define SID_SD_A11Y_P_PAGE_N_STYLE (SID_SD_A11Y_START + 38) -#define SID_SD_A11Y_P_NOTES_N_STYLE (SID_SD_A11Y_START + 39) -#define SID_SD_A11Y_P_HANDOUT_N_STYLE (SID_SD_A11Y_START + 40) -#define SID_SD_A11Y_P_UNKNOWN_N_STYLE (SID_SD_A11Y_START + 41) -#define SID_SD_A11Y_P_FOOTER_N_STYLE (SID_SD_A11Y_START + 42) -#define SID_SD_A11Y_P_HEADER_N_STYLE (SID_SD_A11Y_START + 43) -#define SID_SD_A11Y_P_DATE_N_STYLE (SID_SD_A11Y_START + 44) -#define SID_SD_A11Y_P_NUMBER_N_STYLE (SID_SD_A11Y_START + 45) - -#define SID_SD_A11Y_D_PRESENTATION_READONLY (SID_SD_A11Y_START + 49) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/accessibility/accessibility.src b/sd/source/ui/accessibility/accessibility.src deleted file mode 100644 index a3511d913857..000000000000 --- a/sd/source/ui/accessibility/accessibility.src +++ /dev/null @@ -1,261 +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 "accessibility.hrc" - -/* Names and descriptions of the Draw/Impress accessibility views - ============================================================== -*/ - -String SID_SD_A11Y_D_DRAWVIEW_N -{ - Text [ en-US ] = "Drawing View"; -}; - -String SID_SD_A11Y_D_DRAWVIEW_D -{ - Text [ en-US ] = "This is where you create and edit drawings."; -}; - -String SID_SD_A11Y_I_DRAWVIEW_N -{ - Text [ en-US ] = "Drawing View"; -}; - -String SID_SD_A11Y_I_DRAWVIEW_D -{ - Text [ en-US ] = "This is where you create and edit slides."; -}; - -String SID_SD_A11Y_I_OUTLINEVIEW_N -{ - Text [ en-US ] = "Outline View"; -}; - -String SID_SD_A11Y_I_OUTLINEVIEW_D -{ - Text [ en-US ] = "This is where you enter or edit text in list form."; -}; - -String SID_SD_A11Y_I_SLIDEVIEW_N -{ - Text [ en-US ] = "Slides View"; -}; - -String SID_SD_A11Y_I_SLIDEVIEW_D -{ - Text [ en-US ] = "This is where you sort slides."; -}; - -String SID_SD_A11Y_I_NOTESVIEW_N -{ - Text [ en-US ] = "Notes View"; -}; - -String SID_SD_A11Y_I_NOTESVIEW_D -{ - Text [ en-US ] = "This is where you enter and view notes."; -}; - -String SID_SD_A11Y_I_HANDOUTVIEW_N -{ - Text [ en-US ] = "Handout View"; -}; - -String SID_SD_A11Y_I_HANDOUTVIEW_D -{ - Text [ en-US ] = "This is where you decide on the layout for handouts."; -}; - -String SID_SD_A11Y_P_TITLE_N -{ - Text [ en-US ] = "PresentationTitle"; -}; - -String SID_SD_A11Y_P_OUTLINER_N -{ - Text [ en-US ] = "PresentationOutliner"; -}; - -String SID_SD_A11Y_P_SUBTITLE_N -{ - Text [ en-US ] = "PresentationSubtitle"; -}; - -String SID_SD_A11Y_P_PAGE_N -{ - Text [ en-US ] = "PresentationPage"; -}; - -String SID_SD_A11Y_P_NOTES_N -{ - Text [ en-US ] = "PresentationNotes"; -}; - -String SID_SD_A11Y_P_HANDOUT_N -{ - Text [ en-US ] = "Handout"; -}; - -String SID_SD_A11Y_P_UNKNOWN_N -{ - Text [ en-US ] = "UnknownAccessiblePresentationShape"; -}; - -String SID_SD_A11Y_P_TITLE_D -{ - Text [ en-US ] = "PresentationTitleShape"; -}; - -String SID_SD_A11Y_P_OUTLINER_D -{ - Text [ en-US ] = "PresentationOutlinerShape"; -}; - -String SID_SD_A11Y_P_SUBTITLE_D -{ - Text [ en-US ] = "PresentationSubtitleShape"; -}; - -String SID_SD_A11Y_P_PAGE_D -{ - Text [ en-US ] = "PresentationPageShape"; -}; - -String SID_SD_A11Y_P_NOTES_D -{ - Text [ en-US ] = "PresentationNotesShape"; -}; - -String SID_SD_A11Y_P_HANDOUT_D -{ - Text [ en-US ] = "PresentationHandoutShape"; -}; - -String SID_SD_A11Y_P_UNKNOWN_D -{ - Text [ en-US ] = "Unknown accessible presentation shape"; -}; - -String SID_SD_A11Y_P_FOOTER_N -{ - Text [ en-US ] = "PresentationFooter"; -}; - -String SID_SD_A11Y_P_FOOTER_D -{ - Text [ en-US ] = "PresentationFooterShape"; -}; - -String SID_SD_A11Y_P_HEADER_N -{ - Text [ en-US ] = "PresentationHeader"; -}; - -String SID_SD_A11Y_P_HEADER_D -{ - Text [ en-US ] = "PresentationHeaderShape"; -}; - -String SID_SD_A11Y_P_DATE_N -{ - Text [ en-US ] = "PresentationDateAndTime"; -}; - -String SID_SD_A11Y_P_DATE_D -{ - Text [ en-US ] = "PresentationDateAndTimeShape"; -}; - -String SID_SD_A11Y_P_NUMBER_N -{ - Text [ en-US ] = "PresentationPageNumber"; -}; - -String SID_SD_A11Y_P_NUMBER_D -{ - Text [ en-US ] = "PresentationPageNumberShape"; -}; - -String SID_SD_A11Y_D_PRESENTATION -{ - Text [ en-US ] = "%PRODUCTNAME Presentation"; -}; - -String SID_SD_A11Y_P_TITLE_N_STYLE -{ - Text [ en-US ] = "Title"; -}; - -String SID_SD_A11Y_P_OUTLINER_N_STYLE -{ - Text [ en-US ] = "Outliner"; -}; - -String SID_SD_A11Y_P_SUBTITLE_N_STYLE -{ - Text [ en-US ] = "Subtitle"; -}; - -String SID_SD_A11Y_P_PAGE_N_STYLE -{ - Text [ en-US ] = "Page"; -}; - -String SID_SD_A11Y_P_NOTES_N_STYLE -{ - Text [ en-US ] = "Notes"; -}; - -String SID_SD_A11Y_P_HANDOUT_N_STYLE -{ - Text [ en-US ] = "Handout"; -}; - -String SID_SD_A11Y_P_UNKNOWN_N_STYLE -{ - Text [ en-US ] = "Unknown Accessible Presentation Shape"; -}; - -String SID_SD_A11Y_P_FOOTER_N_STYLE -{ - Text [ en-US ] = "Footer"; -}; - -String SID_SD_A11Y_P_HEADER_N_STYLE -{ - Text [ en-US ] = "Header"; -}; - -String SID_SD_A11Y_P_DATE_N_STYLE -{ - Text [ en-US ] = "Date"; -}; - -String SID_SD_A11Y_P_NUMBER_N_STYLE -{ - Text [ en-US ] = "Number"; -}; - -String SID_SD_A11Y_D_PRESENTATION_READONLY -{ - Text [ en-US ] = "(read-only)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc deleted file mode 100644 index 5f47546f238c..000000000000 --- a/sd/source/ui/animations/CustomAnimation.hrc +++ /dev/null @@ -1,63 +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_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC -#define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC - -#include "glob.hrc" - -// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -// attention, we have 200 ids free after RID_CUSTOMANIMATION_START -// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -#define STR_CUSTOMANIMATION_REPEAT_NONE RID_CUSTOMANIMATION_START+5 -#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK RID_CUSTOMANIMATION_START+6 -#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE RID_CUSTOMANIMATION_START+7 -#define STR_CUSTOMANIMATION_DIRECTION_PROPERTY RID_CUSTOMANIMATION_START+8 -#define STR_CUSTOMANIMATION_ZOOM_PROPERTY RID_CUSTOMANIMATION_START+9 -#define STR_CUSTOMANIMATION_SPOKES_PROPERTY RID_CUSTOMANIMATION_START+10 -#define STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY RID_CUSTOMANIMATION_START+11 -#define STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY RID_CUSTOMANIMATION_START+12 -#define STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY RID_CUSTOMANIMATION_START+13 -#define STR_CUSTOMANIMATION_STYLE_PROPERTY RID_CUSTOMANIMATION_START+14 -#define STR_CUSTOMANIMATION_FONT_PROPERTY RID_CUSTOMANIMATION_START+15 -#define STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY RID_CUSTOMANIMATION_START+16 -#define STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY RID_CUSTOMANIMATION_START+17 -#define STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY RID_CUSTOMANIMATION_START+18 -#define STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY RID_CUSTOMANIMATION_START+19 -#define STR_CUSTOMANIMATION_SIZE_PROPERTY RID_CUSTOMANIMATION_START+20 -#define STR_CUSTOMANIMATION_AMOUNT_PROPERTY RID_CUSTOMANIMATION_START+21 -#define STR_CUSTOMANIMATION_COLOR_PROPERTY RID_CUSTOMANIMATION_START+22 -#define STR_CUSTOMANIMATION_NO_SOUND RID_CUSTOMANIMATION_START+23 -#define STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND RID_CUSTOMANIMATION_START+24 -#define STR_CUSTOMANIMATION_SCALE_PROPERTY RID_CUSTOMANIMATION_START+25 -#define STR_CUSTOMANIMATION_SAMPLE RID_CUSTOMANIMATION_START+26 -#define STR_CUSTOMANIMATION_BROWSE_SOUND RID_CUSTOMANIMATION_START+27 -#define STR_CUSTOMANIMATION_TRIGGER RID_CUSTOMANIMATION_START+35 -#define STR_CUSTOMANIMATION_LIST_HELPTEXT RID_CUSTOMANIMATION_START+36 -#define STR_CUSTOMANIMATION_USERPATH RID_CUSTOMANIMATION_START+37 -#define STR_SLIDETRANSITION_NONE RID_CUSTOMANIMATION_START+38 -#define STR_CUSTOMANIMATION_ENTRANCE RID_CUSTOMANIMATION_START+39 -#define STR_CUSTOMANIMATION_EMPHASIS RID_CUSTOMANIMATION_START+40 -#define STR_CUSTOMANIMATION_EXIT RID_CUSTOMANIMATION_START+41 -#define STR_CUSTOMANIMATION_MOTION_PATHS RID_CUSTOMANIMATION_START+42 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src deleted file mode 100644 index e18c16da87cc..000000000000 --- a/sd/source/ui/animations/CustomAnimation.src +++ /dev/null @@ -1,177 +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 "CustomAnimation.hrc" - -String STR_CUSTOMANIMATION_REPEAT_NONE -{ - Text [ en-US ] = "none"; -}; - -String STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK -{ - Text [ en-US ] = "Until next click"; -}; - -String STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE -{ - Text [ en-US ] = "Until end of slide"; -}; - -String STR_CUSTOMANIMATION_DIRECTION_PROPERTY -{ - Text [ en-US ] = "Direction:"; -}; - -String STR_CUSTOMANIMATION_ZOOM_PROPERTY -{ - Text [ en-US ] = "Zoom:"; -}; - -String STR_CUSTOMANIMATION_SPOKES_PROPERTY -{ - Text [ en-US ] = "Spokes:"; -}; - -String STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY -{ - Text [ en-US ] = "First color:"; -}; - -String STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY -{ - Text [ en-US ] = "Second color:"; -}; - -String STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY -{ - Text [ en-US ] = "Fill color:"; -}; - -String STR_CUSTOMANIMATION_STYLE_PROPERTY -{ - Text [ en-US ] = "Style:"; -}; - -String STR_CUSTOMANIMATION_FONT_PROPERTY -{ - Text [ en-US ] = "Font:"; -}; - -String STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY -{ - Text [ en-US ] = "Font color:"; -}; - -String STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY -{ - Text [ en-US ] = "Style:"; -}; - -String STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY -{ - Text [ en-US ] = "Typeface:"; -}; - -String STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY -{ - Text [ en-US ] = "Line color:"; -}; - -String STR_CUSTOMANIMATION_SIZE_PROPERTY -{ - Text [ en-US ] = "Font size:"; -}; - -String STR_CUSTOMANIMATION_SCALE_PROPERTY -{ - Text [ en-US ] = "Size:"; -}; - -String STR_CUSTOMANIMATION_AMOUNT_PROPERTY -{ - Text [ en-US ] = "Amount:"; -}; - -String STR_CUSTOMANIMATION_COLOR_PROPERTY -{ - Text [ en-US ] = "Color:"; -}; - -String STR_CUSTOMANIMATION_NO_SOUND -{ - Text [ en-US ] = "(No sound)"; -}; - -String STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND -{ - Text [ en-US ] = "(Stop previous sound)"; -}; - -String STR_CUSTOMANIMATION_BROWSE_SOUND -{ - Text [ en-US ] = "Other sound..."; -}; - -String STR_CUSTOMANIMATION_SAMPLE -{ - Text [ en-US ] = "Sample"; -}; - -String STR_CUSTOMANIMATION_TRIGGER -{ - Text [ en-US ] = "Trigger"; -}; - -String STR_CUSTOMANIMATION_LIST_HELPTEXT -{ - Text [ en-US ] = "First select the slide element and then click 'Add...' to add an animation effect."; -}; - -String STR_CUSTOMANIMATION_USERPATH -{ - Text [ en-US ] = "User paths"; -}; - -String STR_CUSTOMANIMATION_ENTRANCE -{ - Text [ en-US ] = "Entrance: %1"; -}; - -String STR_CUSTOMANIMATION_EMPHASIS -{ - Text [ en-US ] = "Emphasis: %1"; -}; - -String STR_CUSTOMANIMATION_EXIT -{ - Text [ en-US ] = "Exit: %1"; -}; - -String STR_CUSTOMANIMATION_MOTION_PATHS -{ - Text [ en-US ] = "Motion Paths: %1"; -}; - -String STR_SLIDETRANSITION_NONE -{ - Text [ en-US ] = "None"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 474d3c6e0860..21b28406cfed 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -68,10 +68,9 @@ #include <svx/dialogs.hrc> #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "CustomAnimationDialog.hxx" #include "CustomAnimationPane.hxx" -#include "CustomAnimation.hrc" #include "STLPropertySet.hxx" #include <avmedia/mediawindow.hxx> diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 32553c5a4ca7..e76705c38141 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include "CustomAnimationList.hxx" -#include "CustomAnimation.hrc" +#include "strings.hrc" #include "CustomAnimationPreset.hxx" #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -41,8 +41,8 @@ #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "bitmaps.hlst" #include <algorithm> diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index a029cd3e5b39..1e5839f16414 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -28,7 +28,7 @@ #include <svtools/treelistbox.hxx> #include <CustomAnimationEffect.hxx> #include "CustomAnimationPreset.hxx" -#include "CustomAnimation.hrc" +#include "strings.hrc" namespace sd { diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 6598d82377c6..62dea9da7497 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -41,7 +41,7 @@ #include "STLPropertySet.hxx" #include "CustomAnimationPane.hxx" #include "CustomAnimationDialog.hxx" -#include "CustomAnimation.hrc" +#include "strings.hrc" #include "CustomAnimationList.hxx" #include "createcustomanimationpanel.hxx" #include <vcl/lstbox.hxx> @@ -72,13 +72,13 @@ #include "EventMultiplexer.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdpage.hxx" #include "drawdoc.hxx" #include "app.hrc" #include <svx/svdetc.hxx> -#include <svx/svdstr.hrc> +#include <svx/strings.hrc> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 2039d405659a..98ca27c8c279 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/animations/XAnimationNode.hpp> #include "SlideTransitionPane.hxx" -#include "CustomAnimation.hrc" +#include "strings.hrc" #include "createslidetransitionpanel.hxx" #include "TransitionPreset.hxx" @@ -34,7 +34,7 @@ #include "DrawController.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <svx/gallery.hxx> #include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index d287a8e74e6c..fe6f8e0a2930 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -68,14 +68,14 @@ #include "annotationmanager.hxx" #include "annotationmanagerimpl.hxx" #include "annotationwindow.hxx" -#include "annotations.hrc" +#include "strings.hrc" #include "Annotation.hxx" #include "ToolBarManager.hxx" #include "DrawDocShell.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "EventMultiplexer.hxx" #include "ViewShellManager.hxx" @@ -831,15 +831,15 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) // The question text depends on the search direction. bool bImpress = mpDoc->GetDocumentType() == DocumentType::Impress; - sal_uInt16 nStringId; + const char* pStringId; if(bForeward) - nStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW; + pStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW; else - nStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW; + pStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW; // Pop up question box that asks the user whether to wrap around. // The dialog is made modal with respect to the whole application. - ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(nStringId)); + ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(pStringId)); aQuestionBox->SetImage( QueryBox::GetStandardImage() ); if (aQuestionBox->Execute() != RET_YES) break; diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc deleted file mode 100644 index b14a1139552f..000000000000 --- a/sd/source/ui/annotations/annotations.hrc +++ /dev/null @@ -1,41 +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_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC -#define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC - -#include "glob.hrc" - -// strings -#define STR_ANNOTATION_TODAY (RID_ANNOTATIONS_START+1) -#define STR_ANNOTATION_YESTERDAY (RID_ANNOTATIONS_START+2) -#define STR_ANNOTATION_NOAUTHOR (RID_ANNOTATIONS_START+3) -#define STR_ANNOTATION_WRAP_FORWARD (RID_ANNOTATIONS_START+4) -#define STR_ANNOTATION_WRAP_BACKWARD (RID_ANNOTATIONS_START+5) -#define STR_ANNOTATION_WRAP_FORWARD_DRAW (RID_ANNOTATIONS_START+6) -#define STR_ANNOTATION_WRAP_BACKWARD_DRAW (RID_ANNOTATIONS_START+7) -#define STR_ANNOTATION_UNDO_INSERT (RID_ANNOTATIONS_START+8) -#define STR_ANNOTATION_UNDO_DELETE (RID_ANNOTATIONS_START+9) -#define STR_ANNOTATION_UNDO_MOVE (RID_ANNOTATIONS_START+10) -#define STR_ANNOTATION_UNDO_EDIT (RID_ANNOTATIONS_START+11) -#define STR_ANNOTATION_REPLY (RID_ANNOTATIONS_START+13) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src deleted file mode 100644 index 05bfe4820d44..000000000000 --- a/sd/source/ui/annotations/annotations.src +++ /dev/null @@ -1,85 +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 "annotations.hrc" -#include "glob.hrc" -#include <svx/svxids.hrc> -#include "helpids.h" - -String STR_ANNOTATION_TODAY -{ - Text [ en-US ] = "Today," ; -}; - -String STR_ANNOTATION_YESTERDAY -{ - Text [ en-US ] = "Yesterday," ; -}; - -String STR_ANNOTATION_NOAUTHOR -{ - Text [ en-US ] = "(no author)" ; -}; - -String STR_ANNOTATION_WRAP_FORWARD -{ - Text [ en-US ] = "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?"; -}; - -String STR_ANNOTATION_WRAP_BACKWARD -{ - Text [ en-US ] = "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?"; -}; - -String STR_ANNOTATION_WRAP_FORWARD_DRAW -{ - Text [ en-US ] = "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?"; -}; - -String STR_ANNOTATION_WRAP_BACKWARD_DRAW -{ - Text [ en-US ] = "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?"; -}; - -String STR_ANNOTATION_UNDO_INSERT -{ - Text [ en-US ] = "Insert Comment"; -}; - -String STR_ANNOTATION_UNDO_DELETE -{ - Text [ en-US ] = "Delete Comment(s)"; -}; - -String STR_ANNOTATION_UNDO_MOVE -{ - Text [ en-US ] = "Move Comment"; -}; - -String STR_ANNOTATION_UNDO_EDIT -{ - Text [ en-US ] = "Edit Comment"; -}; - -String STR_ANNOTATION_REPLY -{ - Text [ en-US ] = "Reply to %1" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 00fddda8a313..659141df6968 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -36,7 +36,7 @@ #include "View.hxx" #include "sdresid.hxx" -#include "annotations.hrc" +#include "strings.hrc" #include "annotationmanagerimpl.hxx" #include "annotationwindow.hxx" #include "annotationtag.hxx" diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index e3c30d990109..7b2349ac2493 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -73,7 +73,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include "annotations.hrc" +#include "strings.hrc" #include "annotationwindow.hxx" #include "annotationmanagerimpl.hxx" diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src deleted file mode 100644 index 88b5e9e33fe4..000000000000 --- a/sd/source/ui/app/res_bmp.src +++ /dev/null @@ -1,45 +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 <sfx2/sfx.hrc> -#include <svl/style.hrc> -#include "glob.hrc" -#include "res_bmp.hrc" - -StringArray RID_GRAPHICSTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; -}; - -StringArray RID_PRESENTATIONSTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index f8d0ee660771..8719d29aa4e2 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -20,6 +20,7 @@ #include <unotools/pathoptions.hxx> #include <svl/languageoptions.hxx> #include <unotools/ucbstreamhelper.hxx> +#include <tools/resmgr.hxx> #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <vcl/status.hxx> @@ -49,9 +50,10 @@ #include "DrawDocShell.hxx" #include "drawdoc.hxx" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + +#include "errhdl.hrc" #include "cfgids.hxx" @@ -67,7 +69,7 @@ void SdModule::InitInterface_Impl() // Ctor SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) -: SfxModule( ResMgr::CreateResMgr("sd"), {pFact1, pFact2} ), +: SfxModule( Translate::Create("sd", Application::GetSettings().GetUILanguageTag()), {pFact1, pFact2} ), pTransferClip(nullptr), pTransferDrag(nullptr), pTransferSelection(nullptr), @@ -84,10 +86,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) pSearchItem->SetAppFlag(SvxSearchApp::DRAW); StartListening( *SfxGetpApp() ); SvxErrorHandler::ensure(); - mpErrorHdl = new SfxErrorHandler( RID_SD_ERRHDL, - ErrCode(ERRCODE_AREA_SD), - ErrCode(ERRCODE_AREA_SD_END), - GetResMgr() ); + mpErrorHdl = new SfxErrorHandler(RID_SD_ERRHDL, ErrCode(ERRCODE_AREA_SD), ErrCode(ERRCODE_AREA_SD_END), &GetResLocale()); // Create a new ref device and (by calling SetReferenceDevice()) // set its resolution to 600 DPI. This leads to a visually better @@ -97,6 +96,11 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) mpVirtualRefDevice->SetReferenceDevice ( VirtualDevice::RefDevMode::Dpi600 ); } +OUString SdResId(const char* pId) +{ + return Translate::get(pId, SD_MOD()->GetResLocale()); +} + // Dtor SdModule::~SdModule() { diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 12945863ea8f..4c2295002487 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -40,9 +40,9 @@ #include <com/sun/star/uno/Sequence.h> #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "sdmod.hxx" #include "pres.hxx" diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 6d72d1fd32e5..5a8b19bf842d 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -47,9 +47,9 @@ #include "sdmod.hxx" #include "app.hrc" -#include "glob.hrc" +#include "family.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "ViewShell.hxx" #include "FrameView.hxx" @@ -799,12 +799,12 @@ SfxStyleFamilies* SdModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SdResId(STR_GRAPHICS_STYLE_FAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_GRAPHICS)), - ResId(RID_GRAPHICSTYLEFAMILY, *SD_MOD()->GetResMgr()))); + RID_GRAPHICSTYLEFAMILY, SD_MOD()->GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SdResId(STR_PRESENTATIONS_STYLE_FAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_PRESENTATIONS)), - ResId(RID_PRESENTATIONSTYLEFAMILY, *SD_MOD()->GetResMgr()))); + RID_PRESENTATIONSTYLEFAMILY, SD_MOD()->GetResLocale())); return pStyleFamilies; } diff --git a/sd/source/ui/app/sdstring.src b/sd/source/ui/app/sdstring.src deleted file mode 100644 index 6751765441fd..000000000000 --- a/sd/source/ui/app/sdstring.src +++ /dev/null @@ -1,42 +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 "sdstring.hrc" - -String STR_SAR_WRAP_FORWARD -{ - Text [ en-US ] = "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?"; -}; - -String STR_SAR_WRAP_BACKWARD -{ - Text [ en-US ] = "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?"; -}; - -String STR_SAR_WRAP_FORWARD_DRAW -{ - Text [ en-US ] = "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?"; -}; - -String STR_SAR_WRAP_BACKWARD_DRAW -{ - Text [ en-US ] = "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src deleted file mode 100644 index d1d9566cdf9f..000000000000 --- a/sd/source/ui/app/strings.src +++ /dev/null @@ -1,1090 +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 "strings.hrc" -#include "glob.hrc" -#include "helpids.h" - -String STR_NULL -{ - Text [ en-US ] = "None" ; -}; -String STR_INSERTPAGE -{ - Text [ en-US ] = "Insert Slide" ; -}; -String STR_INSERTLAYER -{ - Text [ en-US ] = "Insert Layer" ; -}; -String STR_MODIFYLAYER -{ - Text [ en-US ] = "Modify Layer" ; -}; -String STR_UNDO_SLIDE_PARAMS -{ - Text [ en-US ] = "Slide parameter" ; -}; -String STR_UNDO_CUT -{ - Text [ en-US ] = "Cut" ; -}; -String STR_UNDO_REPLACE -{ - Text [ en-US ] = "Replace" ; -}; -String STR_UNDO_DRAGDROP -{ - Text [ en-US ] = "Drag and Drop" ; -}; -String STR_INSERTGRAPHIC -{ - Text [ en-US ] = "Insert Image" ; -}; -String STR_UNDO_BEZCLOSE -{ - Text [ en-US ] = "Close Polygon" ; -}; -String STR_SLIDE_SORTER_MODE -{ - Text [ en-US ] = "Slide Sorter" ; -}; -String STR_NORMAL_MODE -{ - Text [ en-US ] = "Normal" ; -}; -String STR_SLIDE_MASTER_MODE -{ - Text [ en-US ] = "Slide Master" ; -}; -String STR_OUTLINE_MODE -{ - Text [ en-US ] = "Outline" ; -}; -String STR_NOTES_MODE -{ - Text [ en-US ] = "Notes" ; -}; -String STR_NOTES_MASTER_MODE -{ - Text [ en-US ] = "Notes Master" ; -}; -String STR_HANDOUT_MASTER_MODE -{ - Text [ en-US ] = "Handout" ; -}; - -String STR_AUTOLAYOUT_NONE -{ - Text [ en-US ] = "Blank Slide" ; -}; -String STR_AUTOLAYOUT_ONLY_TITLE -{ - Text [ en-US ] = "Title Only" ; -}; -String STR_AUTOLAYOUT_ONLY_TEXT -{ - Text [ en-US ] = "Centered Text" ; -}; -String STR_AUTOLAYOUT_TITLE -{ - Text [ en-US ] = "Title Slide" ; -}; -String STR_AUTOLAYOUT_CONTENT -{ - Text [ en-US ] = "Title, Content" ; -}; -String STR_AUTOLAYOUT_2CONTENT -{ - Text [ en-US ] = "Title and 2 Content" ; -}; -String STR_AUTOLAYOUT_CONTENT_2CONTENT -{ - Text [ en-US ] = "Title, Content and 2 Content" ; -}; -String STR_AUTOLAYOUT_2CONTENT_CONTENT -{ - Text [ en-US ] = "Title, 2 Content and Content" ; -}; -String STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT -{ - Text [ en-US ] = "Title, 2 Content over Content" ; -}; -String STR_AUTOLAYOUT_CONTENT_OVER_CONTENT -{ - Text [ en-US ] = "Title, Content over Content" ; -}; -String STR_AUTOLAYOUT_4CONTENT -{ - Text [ en-US ] = "Title, 4 Content" ; -}; -String STR_AUTOLAYOUT_6CONTENT -{ - Text [ en-US ] = "Title, 6 Content" ; -}; -String STR_AL_TITLE_VERT_OUTLINE -{ - Text [ en-US ] = "Title, Vertical Text" ; -}; -String STR_AL_TITLE_VERT_OUTLINE_CLIPART -{ - Text [ en-US ] = "Title, Vertical Text, Clipart" ; -}; -String STR_AL_VERT_TITLE_TEXT_CHART -{ - Text [ en-US ] = "Vertical Title, Text, Chart" ; -}; -String STR_AL_VERT_TITLE_VERT_OUTLINE -{ - Text [ en-US ] = "Vertical Title, Vertical Text" ; -}; - -String STR_AUTOLAYOUT_HANDOUT1 -{ - Text [ en-US ] = "One Slide" ; -}; -String STR_AUTOLAYOUT_HANDOUT2 -{ - Text [ en-US ] = "Two Slides" ; -}; -String STR_AUTOLAYOUT_HANDOUT3 -{ - Text [ en-US ] = "Three Slides" ; -}; -String STR_AUTOLAYOUT_HANDOUT4 -{ - Text [ en-US ] = "Four Slides" ; -}; -String STR_AUTOLAYOUT_HANDOUT6 -{ - Text [ en-US ] = "Six Slides" ; -}; -String STR_AUTOLAYOUT_HANDOUT9 -{ - Text [ en-US ] = "Nine Slides" ; -}; -String STR_DISPLAYMODE_EDITMODES -{ - Text [ en-US ] = "Edit Modes" ; -}; -String STR_DISPLAYMODE_MASTERMODES -{ - Text [ en-US ] = "Master Modes" ; -}; -String STR_AUTOLAYOUT_NOTES -{ - Text [ en-US ] = "Notes" ; -}; -String STR_TRANSFORM -{ - Text [ en-US ] = "Transform" ; -}; -String STR_LINEEND -{ - Text [ en-US ] = "Line Ends" ; -}; -String STR_DESC_LINEEND -{ - Text [ en-US ] = "Please enter a name for the new arrowhead:" ; -}; -String STR_WARN_NAME_DUPLICATE -{ - Text [ en-US ] = "The name chosen already exists. \nPlease enter another name." ; -}; -String STR_UNDO_ANIMATION -{ - Text [ en-US ] = "Animation parameters" ; -}; -String STR_EXPORT_HTML_NAME -{ - Text [ en-US ] = "Web Page"; -}; -String STR_UNDO_COPYOBJECTS -{ - Text [ en-US ] = "Duplicate" ; -}; -String STR_TITLE_NAMEGROUP -{ - Text [ en-US ] = "Name Object"; -}; -String STR_DESC_NAMEGROUP -{ - Text [ en-US ] = "Name"; -}; -String STR_WARN_PAGE_EXISTS -{ - Text [ en-US ] = "The slide name already exists or is invalid. Please enter another name." ; -}; -String STR_SNAPDLG_SETLINE -{ - Text [ en-US ] = "Edit Snap Line" ; -}; -String STR_SNAPDLG_SETPOINT -{ - Text [ en-US ] = "Edit Snap Point" ; -}; -String STR_POPUP_EDIT_SNAPLINE -{ - Text [ en-US ] = "Edit Snap Line..." ; -}; -String STR_POPUP_EDIT_SNAPPOINT -{ - Text [ en-US ] = "Edit Snap Point..." ; -}; -String STR_POPUP_DELETE_SNAPLINE -{ - Text [ en-US ] = "Delete Snap Line" ; -}; -String STR_POPUP_DELETE_SNAPPOINT -{ - Text [ en-US ] = "Delete Snap Point" ; -}; -String STR_IMPRESS -{ - Text [ en-US ] = "StarImpress 4.0" ; -}; -String STR_LAYER -{ - Text [ en-US ] = "Layer" ; -}; -String STR_UNDO_DELETEPAGES -{ - Text [ en-US ] = "Delete slides" ; -}; -String STR_UNDO_INSERTPAGES -{ - Text [ en-US ] = "Insert slides" ; -}; -String STR_ASK_DELETE_LAYER -{ - Text [ en-US ] = "Are you sure you want to delete the level \"$\"?\nNote: All objects on this level will be deleted!" ; -}; -String STR_ASK_DELETE_ALL_PICTURES -{ - Text [ en-US ] = "Do you really want to delete all images?" ; -}; -String STR_UNDO_CHANGE_TITLE_AND_LAYOUT -{ - Text [ en-US ] = "Modify title and outline" ; -}; -String STR_WAV_FILE -{ - Text [ en-US ] = "Audio" ; -}; -String STR_MIDI_FILE -{ - Text [ en-US ] = "MIDI" ; -}; -String STR_AU_FILE -{ - Text [ en-US ] = "Sun/NeXT Audio" ; -}; -String STR_VOC_FILE -{ - Text [ en-US ] = "Creative Labs Audio" ; -}; -String STR_AIFF_FILE -{ - Text [ en-US ] = "Apple/SGI Audio" ; -}; -String STR_SVX_FILE -{ - Text [ en-US ] = "Amiga SVX Audio" ; -}; -String STR_SD_PAGE -{ - Text [ en-US ] = "Slide" ; -}; -String STR_SD_PAGE_COUNT -{ - Text [ en-US ] = "Slide %1 of %2" ; -}; -String STR_SD_PAGE_COUNT_CUSTOM -{ - Text [ en-US ] = "Slide %1 of %2 (%3)" ; -}; -String STR_ALL_FILES -{ - Text [ en-US ] = "All files" ; -}; -String STR_UNDO_INSERT_TEXTFRAME -{ - Text [ en-US ] = "Insert text frame" ; -}; -String STR_ACTION_NOTPOSSIBLE -{ - Text [ en-US ] = "This function cannot be run \nwith the selected objects." ; -}; -String STR_DLG_INSERT_PAGES_FROM_FILE -{ - Text [ en-US ] = "Insert File" ; -}; -String STR_READ_DATA_ERROR -{ - Text [ en-US ] = "The file could not be loaded!" ; -}; -String STR_SCALE_OBJECTS -{ - Text [ en-US ] = "The page size of the target document is different than the source document.\n\nDo you want to scale the copied objects to fit the new page size?" ; -}; -String STR_CREATE_PAGES -{ - Text [ en-US ] = "Create Slides" ; -}; -String STR_UNDO_CHANGE_PAGEFORMAT -{ - Text [ en-US ] = "Modify page format" ; -}; -String STR_UNDO_CHANGE_PAGEBORDER -{ - Text [ en-US ] = "Modify page margins" ; -}; -String STR_EDIT_OBJ -{ - Text [ en-US ] = "~Edit" ; -}; -String STR_DELETE_PAGES -{ - Text [ en-US ] = "Delete Slides" ; -}; -String STR_WARN_PRINTFORMAT_FAILURE -{ - Text [ en-US ] = "The document format could not be set on the specified printer." ; -}; -String STR_IMPORT_GRFILTER_OPENERROR -{ - Text [ en-US ] = "Image file cannot be opened" ; -}; -String STR_IMPORT_GRFILTER_IOERROR -{ - Text [ en-US ] = "Image file cannot be read" ; -}; -String STR_IMPORT_GRFILTER_FORMATERROR -{ - Text [ en-US ] = "Unknown image format" ; -}; -String STR_IMPORT_GRFILTER_VERSIONERROR -{ - Text [ en-US ] = "This image file version is not supported" ; -}; -String STR_IMPORT_GRFILTER_FILTERERROR -{ - Text [ en-US ] = "Image filter not found" ; -}; -String STR_IMPORT_GRFILTER_TOOBIG -{ - Text [ en-US ] = "Not enough memory to import image" ; -}; -String STR_OBJECTS -{ - Text [ en-US ] = "Objects" ; -}; -String STR_END_SPELLING -{ - Text [ en-US ] = "Spellcheck of entire document has been completed." ; -}; -String STR_END_SPELLING_OBJ -{ - Text [ en-US ] = "The spellcheck for the selected objects has been completed." ; -}; -String STR_ASK_FOR_CONVERT_TO_BEZIER -{ - Text [ en-US ] = "Convert selected object to curve?" ; -}; -String STR_UNDO_CHANGE_PRES_OBJECT -{ - Text [ en-US ] = "Modify presentation object '$'" ; -}; -String STR_UNDO_MODIFY_PAGE -{ - Text [ en-US ] = "Slide layout" ; -}; -String STR_UNDO_INSERT_FILE -{ - Text [ en-US ] = "Insert file" ; -}; -String STR_UNDO_INSERT_SPECCHAR -{ - Text [ en-US ] = "Insert special character" ; -}; -String STR_UNDO_SET_PRESLAYOUT -{ - Text [ en-US ] = "Apply presentation layout" ; -}; -String STR_PLAY -{ - Text [ en-US ] = "~Play" ; -}; -String STR_STOP -{ - Text [ en-US ] = "Sto~p" ; -}; -String STR_UNDO_ORIGINALSIZE -{ - Text [ en-US ] = "Original Size" ; -}; -String STR_WARN_SCALE_FAIL -{ - Text [ en-US ] = "The specified scale is invalid.\nDo you want to enter a new one?" ; -}; -String STR_CLICK_ACTION_NONE -{ - Text [ en-US ] = "No action" ; -}; -String STR_CLICK_ACTION_PREVPAGE -{ - Text [ en-US ] = "Go to previous slide" ; -}; -String STR_CLICK_ACTION_NEXTPAGE -{ - Text [ en-US ] = "Go to next slide" ; -}; -String STR_CLICK_ACTION_FIRSTPAGE -{ - Text [ en-US ] = "Go to first slide" ; -}; -String STR_CLICK_ACTION_LASTPAGE -{ - Text [ en-US ] = "Go to last slide" ; -}; -String STR_CLICK_ACTION_BOOKMARK -{ - Text [ en-US ] = "Go to page or object" ; -}; -String STR_CLICK_ACTION_DOCUMENT -{ - Text [ en-US ] = "Go to document" ; -}; -String STR_CLICK_ACTION_SOUND -{ - Text [ en-US ] = "Play audio" ; -}; -String STR_CLICK_ACTION_VERB -{ - Text [ en-US ] = "Start object action" ; -}; -String STR_CLICK_ACTION_PROGRAM -{ - Text [ en-US ] = "Run program" ; -}; -String STR_CLICK_ACTION_MACRO -{ - Text [ en-US ] = "Run macro" ; -}; -String STR_CLICK_ACTION_STOPPRESENTATION -{ - Text [ en-US ] = "Exit presentation" ; -}; -String STR_EFFECTDLG_JUMP -{ - Text [ en-US ] = "Target"; -}; -String STR_EFFECTDLG_ACTION -{ - Text [ en-US ] = "Act~ion"; -}; -String STR_EFFECTDLG_SOUND -{ - Text [ en-US ] = "Audio" ; -}; -String STR_EFFECTDLG_PAGE_OBJECT -{ - Text [ en-US ] = "Slide / Object" ; -}; -String STR_EFFECTDLG_DOCUMENT -{ - Text [ en-US ] = "Document" ; -}; -String STR_EFFECTDLG_PROGRAM -{ - Text [ en-US ] = "Program" ; -}; -String STR_EFFECTDLG_MACRO -{ - Text [ en-US ] = "Macro" ; -}; - // Strings for animation effects -String STR_INSERT_TEXT -{ - Text [ en-US ] = "Insert Text" ; -}; -String STR_SLIDE_SINGULAR -{ - Text [ en-US ] = " Slide" ; -}; -String STR_SLIDE_PLURAL -{ - Text [ en-US ] = " Slides" ; -}; -String STR_LOAD_PRESENTATION_LAYOUT -{ - Text [ en-US ] = "Load Slide Design" ; -}; -String STR_DRAGTYPE_URL -{ - Text [ en-US ] = "Insert as Hyperlink" ; -}; -String STR_DRAGTYPE_EMBEDDED -{ - Text [ en-US ] = "Insert as Copy" ; -}; -String STR_DRAGTYPE_LINK -{ - Text [ en-US ] = "Insert as Link" ; -}; -String STR_GLUE_ESCDIR_SMART -{ - Text [ en-US ] = "Smart" ; -}; -String STR_GLUE_ESCDIR_LEFT -{ - Text [ en-US ] = "Left" ; -}; -String STR_GLUE_ESCDIR_RIGHT -{ - Text [ en-US ] = "Right" ; -}; -String STR_GLUE_ESCDIR_TOP -{ - Text [ en-US ] = "Top" ; -}; -String STR_GLUE_ESCDIR_BOTTOM -{ - Text [ en-US ] = "Bottom" ; -}; -String STR_GLUE_ESCDIR_LO -{ - Text [ en-US ] = "Top Left?" ; -}; -String STR_GLUE_ESCDIR_LU -{ - Text [ en-US ] = "Bottom Left?" ; -}; -String STR_GLUE_ESCDIR_RO -{ - Text [ en-US ] = "Top Right?" ; -}; -String STR_GLUE_ESCDIR_RU -{ - Text [ en-US ] = "Bottom Right?" ; -}; -String STR_GLUE_ESCDIR_HORZ -{ - Text [ en-US ] = "Horizontal" ; -}; -String STR_GLUE_ESCDIR_VERT -{ - Text [ en-US ] = "Vertical" ; -}; -String STR_GLUE_ESCDIR_ALL -{ - Text [ en-US ] = "All?" ; -}; -String STR_CANT_PERFORM_IN_LIVEMODE -{ - Text [ en-US ] = "This action can't be run in the live mode." ; -}; -String STR_PUBLISH_BACK -{ - Text [ en-US ] = "Back" ; -}; -String STR_PUBLISH_NEXT -{ - Text [ en-US ] = "Continue" ; -}; -String STR_PUBLISH_OUTLINE -{ - Text [ en-US ] = "Overview" ; -}; -String STR_EYEDROPPER -{ - Text [ en-US ] = "Color Replacer" ; -}; -String STR_UNDO_MORPHING -{ - Text [ en-US ] = "Cross-fading" ; -}; -String STR_UNDO_COLORRESOLUTION -{ - Text [ en-US ] = "Color resolution" ; -}; -String STR_UNDO_EXPAND_PAGE -{ - Text [ en-US ] = "Expand Slide" ; -}; -String STR_UNDO_SUMMARY_PAGE -{ - Text [ en-US ] = "Table of Contents Slide" ; -}; -String STR_TWAIN_NO_SOURCE_UNX -{ - Text [ en-US ] = "No SANE source is available at the moment." ; -}; - -String STR_TWAIN_NO_SOURCE -{ - Text [ en-US ] = "At present, no TWAIN source is available." ; -}; - -String STR_FIX -{ - Text [ en-US ] = "Fixed" ; -}; -String STR_VAR -{ - Text [ en-US ] = "Variable" ; -}; -String STR_STANDARD_NORMAL -{ - Text [ en-US ] = "Standard" ; -}; -String STR_STANDARD_SMALL -{ - Text [ en-US ] = "Standard (short)" ; -}; -String STR_STANDARD_BIG -{ - Text [ en-US ] = "Standard (long)" ; -}; -String STR_FILEFORMAT_NAME_EXT -{ - Text [ en-US ] = "File name" ; -}; -String STR_FILEFORMAT_FULLPATH -{ - Text [ en-US ] = "Path/File name" ; -}; -String STR_FILEFORMAT_PATH -{ - Text [ en-US ] = "Path" ; -}; -String STR_FILEFORMAT_NAME -{ - Text [ en-US ] = "File name without extension" ; -}; -String STR_NEW_CUSTOMSHOW -{ - Text [ en-US ] = "New Custom Slide Show" ; -}; -String STR_COPY_CUSTOMSHOW -{ - Text [ en-US ] = "Copy " ; -}; -String STR_IMPRESS_DOCUMENT -{ - Text [ en-US ] = "Presentation" ; -}; -String STR_IMPRESS_DOCUMENT_FULLTYPE_60 -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Presentation" ; -}; -String STR_GRAPHIC_DOCUMENT -{ - Text [ en-US ] = "Drawing" ; -}; -String STR_GRAPHIC_DOCUMENT_FULLTYPE_60 -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Drawing" ; -}; -String STR_BREAK_METAFILE -{ - Text [ en-US ] = "Ungroup Metafile(s)..."; -}; -String STR_BREAK_FAIL -{ - Text [ en-US ] = "It was not possible to ungroup all drawing objects."; -}; - -// HtmlExport -String STR_PUBDLG_SAMENAME -{ - Text [ en-US ] = "A design already exists with this name.\nDo you want to replace it?"; -}; - -String STR_HTMLATTR_TEXT -{ - Text [ en-US ] = "Text"; -}; - -String STR_HTMLATTR_LINK -{ - Text [ en-US ] = "Hyperlink"; -}; - -String STR_HTMLATTR_VLINK -{ - Text [ en-US ] = "Visited link"; -}; - -String STR_HTMLATTR_ALINK -{ - Text [ en-US ] = "Active link"; -}; - -String STR_HTMLEXP_NOTES -{ - Text [ en-US ] = "Notes"; -}; - -String STR_HTMLEXP_CONTENTS -{ - Text [ en-US ] = "Table of contents"; -}; - -String STR_HTMLEXP_CLICKSTART -{ - Text [ en-US ] = "Click here to start"; -}; - -String STR_HTMLEXP_AUTHOR -{ - Text [ en-US ] = "Author"; -}; - -String STR_HTMLEXP_EMAIL -{ - Text [ en-US ] = "E-mail"; -}; - -String STR_HTMLEXP_HOMEPAGE -{ - Text [ en-US ] = "Homepage"; -}; - -String STR_HTMLEXP_INFO -{ - Text [ en-US ] = "Further information"; -}; - -String STR_HTMLEXP_DOWNLOAD -{ - Text [ en-US ] = "Download presentation"; -}; - -String STR_HTMLEXP_NOFRAMES -{ - Text [ en-US ] = "Unfortunately your browser does not support floating frames."; -}; - -String STR_HTMLEXP_FIRSTPAGE -{ - Text [ en-US ] = "First page"; -}; - -String STR_HTMLEXP_LASTPAGE -{ - Text [ en-US ] = "Last page"; -}; - -String STR_HTMLEXP_SETTEXT -{ - Text [ en-US ] = "Text"; -}; - -String STR_HTMLEXP_SETGRAPHIC -{ - Text [ en-US ] = "Image"; -}; - -String STR_HTMLEXP_OUTLINE -{ - Text [ en-US ] = "With contents"; -}; - -String STR_HTMLEXP_NOOUTLINE -{ - Text [ en-US ] = "Without contents"; -}; - -String STR_WEBVIEW_SAVE -{ - Text [ en-US ] = "To given page"; -}; - -String STR_UNDO_VECTORIZE -{ - Text [ en-US ] = "Convert bitmap to polygon" ; -}; - -String STR_PRES_SOFTEND -{ - Text [ en-US ] = "Click to exit presentation..." ; -}; - -String STR_PRES_PAUSE -{ - Text [ en-US ] = "Pause..." ; -}; - -String STR_UNDO_APPLY_3D_FAVOURITE -{ - Text [ en-US ] = "Apply 3D favorite"; -}; - -String STR_UNDO_GRAFFILTER -{ - Text [ en-US ] = "Image filter" ; -}; - -String STR_WARNING_NOSOUNDFILE -{ - Text [ en-US ] = "The file %\nis not a valid audio file !" ; -}; - -String STR_UNDO_CONVERT_TO_METAFILE -{ - Text [ en-US ] = "Convert to metafile" ; -}; - -String STR_UNDO_CONVERT_TO_BITMAP -{ - Text [ en-US ] = "Convert to bitmap" ; -}; -String STR_HTMLEXP_ERROR_CREATE_FILE -{ - Text [ en-US ] = "Cannot create the file $(URL1)."; -}; -String STR_HTMLEXP_ERROR_OPEN_FILE -{ - Text [ en-US ] = "Could not open the file $(URL1)."; -}; -String STR_HTMLEXP_ERROR_COPY_FILE -{ - Text [ en-US ] = "The file $(URL1) could not be copied to $(URL2)"; -}; -String STR_PAGE_BACKGROUND_TITLE -{ - Text [ en-US ] = "Page Settings" ; -}; -String STR_PAGE_BACKGROUND_TXT -{ - Text [ en-US ] = "Background settings for all pages?" ; -}; - -String STR_STATUSBAR_MASTERPAGE -{ - Text [ en-US ] = "Slide Master name. Right-click for list and double-click for dialog."; -}; - -String STR_TITLE_RENAMESLIDE -{ - Text [ en-US ] = "Rename Slide"; -}; -String STR_DESC_RENAMESLIDE -{ - Text [ en-US ] = "Name"; -}; - -String STR_PLACEHOLDER_DESCRIPTION_TITLE -{ - Text [ en-US ] = "Title Area for AutoLayouts" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_OUTLINE -{ - Text [ en-US ] = "Object Area for AutoLayouts" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_FOOTER -{ - Text [ en-US ] = "Footer Area" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_HEADER -{ - Text [ en-US ] = "Header Area" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_DATETIME -{ - Text [ en-US ] = "Date Area" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_SLIDE -{ - Text [ en-US ] = "Slide Number Area" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_NUMBER -{ - Text [ en-US ] = "Page Number Area" ; -}; - -String STR_FIELD_PLACEHOLDER_HEADER -{ - Text [ en-US ] = "<header>" ; -}; - -String STR_FIELD_PLACEHOLDER_FOOTER -{ - Text [ en-US ] = "<footer>" ; -}; - -String STR_FIELD_PLACEHOLDER_DATETIME -{ - Text [ en-US ] = "<date/time>" ; -}; -String STR_FIELD_PLACEHOLDER_NUMBER -{ - Text [ en-US ] = "<number>" ; -}; -String STR_FIELD_PLACEHOLDER_COUNT -{ - Text [ en-US ] = "<count>" ; -}; - -String STR_FIELD_PLACEHOLDER_SLIDENAME -{ - Text [ en-US ] = "<slide-name>" ; -}; - -String STR_FIELD_PLACEHOLDER_PAGENAME -{ - Text [ en-US ] = "<page-name>" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_NOTES -{ - Text [ en-US ] = "Notes Area"; -}; - -String STR_UNDO_HANGULHANJACONVERSION -{ - Text [ en-US ] = "Hangul/Hanja Conversion"; -}; - -String STR_LEFT_PANE_IMPRESS_TITLE -{ - Text [ en-US ] = "Slides"; -}; -String STR_LEFT_PANE_DRAW_TITLE -{ - Text [ en-US ] = "Pages"; -}; -String STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION -{ - Text [ en-US ] = "Preview not available"; -}; -String STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION -{ - Text [ en-US ] = "Preparing preview"; -}; -String STR_TASKPANEL_LAYOUT_MENU_TITLE -{ - Text [ en-US ] = "Layouts"; -}; -String STR_GRAPHICS_STYLE_FAMILY -{ - Text [ en-US ] = "Drawing Styles"; -}; -String STR_PRESENTATIONS_STYLE_FAMILY -{ - Text [ en-US ] = "Presentation Styles"; -}; -String STR_CELL_STYLE_FAMILY -{ - Text [ en-US ] = "Cell Styles"; -}; -String STR_NAVIGATOR_SHOW_NAMED_SHAPES -{ - Text [ en-US ] = "Named shapes"; -}; -String STR_NAVIGATOR_SHOW_ALL_SHAPES -{ - Text [ en-US ] = "All shapes"; -}; -String STR_NAVIGATOR_SHAPE_BASE_NAME -{ - Text [ en-US ] = "Shape %1"; -}; -String STR_SET_BACKGROUND_PICTURE -{ - Text [ en-US ] = "Set Background Image for Slide ..." ; -}; - -String RID_ANNOTATIONS_START -{ - Text [ en-US ] = "Comments"; -}; - -String STR_RESET_LAYOUT -{ - Text[ en-US ] = "Reset Slide Layout"; -}; - -String STR_INSERT_TABLE -{ - Text [ en-US ] = "Insert Table"; -}; - -String STR_INSERT_CHART -{ - Text [ en-US ] = "Insert Chart"; -}; - -String STR_INSERT_PICTURE -{ - Text [ en-US ] = "Insert Image"; -}; - -String STR_INSERT_MOVIE -{ - Text [ en-US ] = "Insert Audio or Video"; -}; - -String STRING_DRAG_AND_DROP_PAGES -{ - Text [ en-US ] = "Drag and Drop Pages" ; -}; - -String STRING_DRAG_AND_DROP_SLIDES -{ - Text [ en-US ] = "Drag and Drop Slides" ; -}; - -String STR_PHOTO_ALBUM_EMPTY_WARNING -{ - Text [ en-US ] = "Please add Images to the Album." ; -}; - -String STR_PHOTO_ALBUM_TEXTBOX -{ - Text [ en-US ] = "Text Slide"; -}; - -String STR_INSERT_3D_MODEL_TITLE -{ - Text [ en-US ] = "Insert 3D Model"; -}; - -String STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS -{ - Text [ en-US ] = "All supported formats"; -}; - -String STR_OBJECTS_TREE -{ - Text [ en-US ] = "Page Tree"; -}; - -String STR_OVERWRITE_WARNING -{ - Text [ en-US ] = "The local target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src deleted file mode 100644 index 30158180382c..000000000000 --- a/sd/source/ui/app/toolbox.src +++ /dev/null @@ -1,34 +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 "app.hrc" -#include "cfgids.hxx" -#include <svx/svxids.hrc> - -String RID_DRAW_MEDIA_TOOLBOX -{ - Text [ en-US ] = "Media Playback" ; -}; - -String RID_DRAW_TABLE_TOOLBOX -{ - Text [ en-US ] = "Table" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index 29748337eca4..8897fc61a634 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -14,7 +14,7 @@ #include <vcl/toolbox.hxx> #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" @@ -71,7 +71,7 @@ struct snewfoil_value_info { sal_uInt16 mnId; const char* msBmpResId; - sal_uInt16 mnStrResId; + const char* mpStrResId; const char* msUnoCommand; }; @@ -93,7 +93,7 @@ static const snewfoil_value_info editmodes[] = BMP_DISPLAYMODE_SLIDE_SORTER, STR_SLIDE_SORTER_MODE, ".uno:DiaMode" }, - {0, "", 0, "" } + {0, "", nullptr, "" } }; static const snewfoil_value_info mastermodes[] = @@ -110,7 +110,7 @@ static const snewfoil_value_info mastermodes[] = BMP_DISPLAYMODE_HANDOUT_MASTER, STR_HANDOUT_MASTER_MODE, ".uno:HandoutMode" }, - {0, "", 0, "" } + {0, "", nullptr, "" } }; @@ -119,7 +119,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn Size aLayoutItemSize; for( ; pInfo->mnId; pInfo++ ) { - OUString aText( SdResId( pInfo->mnStrResId ) ); + OUString aText(SdResId(pInfo->mpStrResId)); BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); pValue->InsertItem(pInfo->mnId, Image(aBmp), aText); diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index b0fa04755aa9..5ebe1e8282ac 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -41,9 +41,9 @@ #include "app.hrc" #include "facreg.hxx" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" #include "pres.hxx" @@ -82,14 +82,14 @@ private: struct snewfoil_value_info_layout { const char* msBmpResId; - sal_uInt16 mnStrResId; + const char* mpStrResId; AutoLayout maAutoLayout; }; static const snewfoil_value_info_layout notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES}, - {"", 0, AUTOLAYOUT_NONE}, + {nullptr, nullptr, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info_layout handout[] = @@ -100,7 +100,7 @@ static const snewfoil_value_info_layout handout[] = {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4}, {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9}, - {"", 0, AUTOLAYOUT_NONE}, + {nullptr, nullptr, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info_layout standard[] = @@ -117,7 +117,7 @@ static const snewfoil_value_info_layout standard[] = {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT }, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_TITLE_4CONTENT }, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_TITLE_6CONTENT }, - {"", 0, AUTOLAYOUT_NONE} + {nullptr, nullptr, AUTOLAYOUT_NONE} }; static const snewfoil_value_info_layout v_standard[] = @@ -127,15 +127,15 @@ static const snewfoil_value_info_layout v_standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT }, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VCONTENT }, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_2VTEXT }, - {"", 0, AUTOLAYOUT_NONE} + {nullptr, nullptr, AUTOLAYOUT_NONE} }; static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo ) { Size aLayoutItemSize; - for( ; pInfo->mnStrResId; pInfo++ ) + for( ; pInfo->mpStrResId; pInfo++ ) { - OUString aText( SdResId( pInfo->mnStrResId ) ); + OUString aText(SdResId(pInfo->mpStrResId)); BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index a1481e44a36b..a7a9506f6821 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -27,9 +27,9 @@ #include "sdmod.hxx" #include "helpids.h" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "DrawViewShell.hxx" #include "Window.hxx" #include "View.hxx" diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index cd83474c0af4..34db1be617a7 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -43,14 +43,14 @@ PaneChildWindow::PaneChildWindow ( sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const sal_uInt16 nTitleBarResId) + const char* pTitleBarResId) : SfxChildWindow (pParentWindow, nId) { SetWindow( VclPtr<PaneDockingWindow>::Create( pBindings, this, pParentWindow, - SdResId(nTitleBarResId))); + SdResId(pTitleBarResId))); SetAlignment(SfxChildAlignment::LEFT); static_cast<SfxDockingWindow*>(GetWindow())->Initialize(pInfo); SetHideNotDelete(true); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 2dbe88d41039..769d5ee79f9a 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -22,7 +22,7 @@ #include "ViewShellBase.hxx" #include "framework/FrameworkHelper.hxx" #include "sdresid.hxx" -#include "res_bmp.hrc" + #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> #include <vcl/taskpanelist.hxx> diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 6b3635e023b7..81487f00edee 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -21,7 +21,7 @@ #include "PaneChildWindows.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include <sfx2/msg.hxx> diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 8b3d06dcd829..c32fc284e896 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -19,7 +19,7 @@ #include <vector> -#include "svtools/controldims.hrc" +#include "svtools/controldims.hxx" #include "RemoteDialogClientBox.hxx" #include "RemoteServer.hxx" @@ -31,7 +31,7 @@ #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> -#include "glob.hrc" +#include "strings.hrc" using namespace std; diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 4071cc1a023e..83f5b9929d2d 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -26,7 +26,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <sfx2/doctempl.hxx> -#include <sfx2/templatelocnames.hrc> #include <com/sun/star/frame/DocumentTemplates.hpp> #include <com/sun/star/frame/XDocumentTemplates.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 250bdee0c546..4388395321d9 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -35,7 +35,7 @@ #include "View.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" -#include "res_bmp.hrc" + #include "ViewShell.hxx" #include <vcl/svapp.hxx> diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 23f8b92d51cd..80209f44ddf1 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -35,7 +35,7 @@ #include "View.hxx" #include "sdresid.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" + namespace sd { diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index c70536b1dc76..5bcce5a073d0 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -26,7 +26,7 @@ #include "sdresid.hxx" #include "app.hrc" -#include "res_bmp.hrc" + #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 540ddbcf911b..f6ca37bee279 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -38,7 +38,7 @@ #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include "bulmaper.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 296349f0d887..80379f718023 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -20,7 +20,7 @@ #include "inspagob.hxx" #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 72fb0312b758..91df1ef2564b 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -43,7 +43,7 @@ #include "pgjump.hxx" #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "drawdoc.hxx" #include "DrawDocShell.hxx" @@ -267,11 +267,11 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) for (sal_uInt16 nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; ++nID) { - sal_uInt16 nRId = GetDragTypeSdStrId((NavigatorDragType)nID); - if( nRId > 0 ) + const char* pRId = GetDragTypeSdStrId((NavigatorDragType)nID); + if (pRId) { DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); - pMenu->InsertItem(nID, SdResId(nRId), MenuItemBits::RADIOCHECK); + pMenu->InsertItem(nID, SdResId(pRId), MenuItemBits::RADIOCHECK); pMenu->SetHelpId(nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL]); } @@ -617,12 +617,12 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) maLbDocs->SelectEntryPos( nPos ); } -sal_uInt16 SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT) +const char* SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT) { switch( eDT ) { case NAVIGATOR_DRAGTYPE_NONE: - return STR_NONE; + return STR_SD_NONE; case NAVIGATOR_DRAGTYPE_URL: return STR_DRAGTYPE_URL; case NAVIGATOR_DRAGTYPE_EMBEDDED: @@ -631,7 +631,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT) return STR_DRAGTYPE_LINK; default: OSL_FAIL( "No resource for DragType available!" ); } - return 0; + return nullptr; } OUString SdNavigatorWin::GetDragTypeSdBmpId(NavigatorDragType eDT) diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index df9f29096e2d..45eb2c5adcb0 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -31,7 +31,7 @@ #include <editeng/outliner.hxx> #include "paragr.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdattr.hrc" class SdParagraphNumTabPage : public SfxTabPage diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index e88ad3551298..a288cd7a117b 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -35,7 +35,7 @@ #include <svl/cjkoptions.hxx> #include "DrawDocShell.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "prltempl.hxx" #include "prltempl.hrc" diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 280856096549..6fe9e2b2b35b 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -22,7 +22,7 @@ #include <vcl/msgbox.hxx> #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "sdpreslt.hxx" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index bf8eec60970d..942a391d4b04 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -40,7 +40,7 @@ #include "sdresid.hxx" #include "navigatr.hxx" #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "customshowlist.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index ef1529ac81bb..2aae8a2bd5ef 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -29,6 +29,7 @@ #include "sdattr.hxx" #include <sfx2/sfxresid.hxx> +#include <sfx2/strings.hrc> #include <vcl/waitobj.hxx> #include <osl/file.hxx> @@ -59,7 +60,7 @@ #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include "strings.hrc" -#include "res_bmp.hrc" + #include "filedlg.hxx" #include <algorithm> @@ -265,8 +266,8 @@ void SdTPAction::Construct() // fill Action-Listbox for (presentation::ClickAction & rAction : maCurrentActions) { - sal_uInt16 nRId = GetClickActionSdResId( rAction ); - m_pLbAction->InsertEntry( SdResId( nRId ) ); + const char* pRId = GetClickActionSdResId(rAction); + m_pLbAction->InsertEntry(SdResId(pRId)); } } @@ -843,7 +844,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) return aStr; } -sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) +const char* SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) { switch( eCA ) { @@ -861,7 +862,7 @@ sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION; default: OSL_FAIL( "No StringResource for ClickAction available!" ); } - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 8f3510bf7839..b05e705a11a9 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -239,12 +239,10 @@ SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttr m_pScaleFrame->Hide(); // fill ListBox with metrics - SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE ); - - for ( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i ) + for (sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i) { - OUString sMetric = aMetricArr.GetStringByPos( i ); - sal_IntPtr nFieldUnit = aMetricArr.GetValue( i ); + OUString sMetric = SvxFieldUnitTable::GetString(i); + sal_IntPtr nFieldUnit = SvxFieldUnitTable::GetValue(i); sal_Int32 nPos = m_pLbMetric->InsertEntry( sMetric ); m_pLbMetric->SetEntryData( nPos, reinterpret_cast<void*>(nFieldUnit) ); } diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 1e0b6d99a5a1..6fdcfd18d24c 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -32,7 +32,7 @@ #include "sdresid.hxx" #include "drawdoc.hxx" #include "stlsheet.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 1062de5e6bdb..325b0750a2f5 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -34,7 +34,7 @@ #include "ClientView.hxx" #include "Window.hxx" #include "strings.hrc" -#include "res_bmp.hrc" + #include "sdresid.hxx" #include "strmname.h" #include "fupoor.hxx" diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 35f8a38ebe0d..060b322f6b7d 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -45,8 +45,8 @@ #include <sfx2/notebookbar/SfxNotebookBar.hxx> #include "strings.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "sdmod.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 13f0db45e22a..c124c564a5a1 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -57,7 +57,7 @@ #include <comphelper/processfactory.hxx> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "strmname.h" #include "FrameView.hxx" diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index e0e7791da206..b59e2c73eba7 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -58,8 +58,8 @@ #include "View.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "fupoor.hxx" #include "fusearch.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index af6393990123..b74f23c41c0b 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -29,7 +29,7 @@ #include "app.hrc" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "GraphicDocShell.hxx" #include "DrawDocShell.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index 07a946765bab..7db884efeefe 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -36,7 +36,7 @@ #include <svx/camera3d.hxx> #include "app.hrc" -#include "res_bmp.hrc" + #include "View.hxx" #include "Window.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 8860c006b2b7..1cb513f6ae60 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -33,7 +33,7 @@ #include "app.hrc" #include "Window.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" + #include "View.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 1de24b2bf9c9..ce8fbdde05c5 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -39,7 +39,7 @@ #include "Window.hxx" #include "ToolBarManager.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 086163373eee..b91dccd0360d 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -62,8 +62,8 @@ #include "Window.hxx" #include "stlpool.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" namespace sd { diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 9add8904b85c..3871611bde24 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -21,7 +21,7 @@ #include <svx/svdpagv.hxx> #include <svx/svxids.hrc> -#include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include "app.hrc" @@ -59,8 +59,8 @@ #include "Window.hxx" #include "stlpool.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" namespace sd { @@ -499,14 +499,14 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) /** * set line starts and ends for the object to be created */ -::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel* pDoc ) +::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc) { ::basegfx::B2DPolyPolygon aRetval; XLineEndListRef pLineEndList = pDoc->GetLineEndList(); if( pLineEndList.is() ) { - OUString aArrowName( SvxResId(nResId) ); + OUString aArrowName(SvxResId(pResId)); long nCount = pLineEndList->Count(); long nIndex; for( nIndex = 0L; nIndex < nCount; nIndex++ ) diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index d2edf1bbca02..b915f74e1233 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -28,7 +28,7 @@ #include <sfx2/viewfrm.hxx> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include "fudraw.hxx" #include "View.hxx" diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 45a3f0f1f5cf..214814626665 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -29,7 +29,7 @@ #include <svx/dialogs.hrc> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "ViewShell.hxx" #include "View.hxx" #include "Window.hxx" @@ -37,7 +37,7 @@ #include "ToolBarManager.hxx" #include "drawdoc.hxx" #include "sdresid.hxx" -#include "res_bmp.hrc" + namespace sd { diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index d1e023eed8c6..bb8db8ff8af5 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -41,9 +41,9 @@ #include "anminfo.hxx" #include "imapinfo.hxx" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "sdmod.hxx" #include "GraphicDocShell.hxx" diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index 53c6a8450b66..1142e77ae1f9 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -25,7 +25,7 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "Window.hxx" #include "drawdoc.hxx" #include "FrameView.hxx" diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 14487d300c3f..413e76224514 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -37,7 +37,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/filedlghelper.hxx> -#include <svtools/sores.hxx> +#include <svtools/strings.hrc> #include <svtools/insdlg.hxx> #include <sfx2/request.hxx> #include <svl/globalnameitem.hxx> @@ -85,7 +85,7 @@ #include <vcl/svapp.hxx> #include "undo/undoobjects.hxx" #include <memory> -#include "glob.hrc" +#include "strings.hrc" #include <config_features.h> diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 9b15e53d8245..daf8b0a00c72 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -51,7 +51,7 @@ #include "View.hxx" #include "strings.hrc" #include "stlpool.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdpage.hxx" #include "strmname.h" #include "ViewShellBase.hxx" diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 95a94b859c6b..0fbecf437dfa 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -33,7 +33,7 @@ #include "svx/xtable.hxx" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "drawdoc.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index f171a22cc1ec..24803eb84020 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -25,7 +25,7 @@ #include <sfx2/request.hxx> #include <editeng/numitem.hxx> #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include <editeng/editdata.hxx> diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 2cd427f0b19b..f93561f116ad 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -43,7 +43,7 @@ #include <editeng/lrspitem.hxx> #include <svx/sdr/properties/properties.hxx> #include <sfx2/bindings.hxx> -#include "glob.hrc" +#include "strings.hrc" #include <editeng/shaditem.hxx> #include <editeng/boxitem.hxx> #include <editeng/sizeitem.hxx> diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index b2b09be755e5..d2e10546c104 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -35,7 +35,7 @@ #include "FrameView.hxx" #include "stlpool.hxx" #include "View.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "glob.hxx" #include "strings.hrc" #include "strmname.h" diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 169dd4f237f3..86b104f84c54 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -25,9 +25,9 @@ #include <svl/hint.hxx> #include "app.hrc" -#include "res_bmp.hrc" + +#include "strings.hrc" #include "strings.hrc" -#include "glob.hrc" #include "prltempl.hrc" #include "strings.hxx" diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index f3df9d260562..8907eb159326 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -44,7 +44,7 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "GraphicDocShell.hxx" #include "sdmod.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index c0ab1580bf6c..329ddbaf849c 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -26,7 +26,7 @@ #include "sdresid.hxx" #include "strings.hrc" #include "sdattr.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdmod.hxx" #include "ViewShell.hxx" #include "Window.hxx" diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 3a5ce9adb82e..1ec074ebfd7d 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -57,8 +57,8 @@ #include "DrawDocShell.hxx" #include "DrawViewShell.hxx" #include "ViewShell.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "prlayout.hxx" #include "prltempl.hrc" #include <svx/xfillit.hxx> diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index f4ccb45eb6c2..1690404032ef 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -54,7 +54,7 @@ #include "sdresid.hxx" #include "app.hrc" -#include "res_bmp.hrc" + #include "ViewShell.hxx" #include "ViewShellBase.hxx" #include "View.hxx" @@ -66,7 +66,7 @@ #include "FrameView.hxx" #include "ToolBarManager.hxx" #include "DrawDocShell.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "pres.hxx" #include "optsitem.hxx" diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 1f361c0f4868..7675f474b3e3 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -67,7 +67,7 @@ rtl::Reference<FuPoor> FuThesaurus::Create( ViewShell* pViewSh, ::sd::Window* pW void FuThesaurus::DoExecute( SfxRequest& ) { SfxErrorContext aContext(ERRCTX_SVX_LINGU_THESAURUS, OUString(), - mpWindow, RID_SVXERRCTX, &DIALOG_MGR() ); + mpWindow, getRID_SVXERRCTX(), &SvxResLocale()); if (mpViewShell && dynamic_cast< DrawViewShell *>( mpViewShell ) != nullptr) { diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 0d0d1c36b3ec..d277a808d6b7 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -33,7 +33,7 @@ public: sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const sal_uInt16 nTitleBarResId); + const char* pTitleBarResId); virtual ~PaneChildWindow() override; }; diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx index d56cc0a23b1d..44ccb06b75e7 100644 --- a/sd/source/ui/inc/cfgids.hxx +++ b/sd/source/ui/inc/cfgids.hxx @@ -29,10 +29,6 @@ // Acceleratoren, Menus, ... #define RID_DRAW_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 7) -// Toolbars -#define RID_DRAW_TABLE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 18) -#define RID_DRAW_MEDIA_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 31) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index f8e2590a06db..9a57ad02d8e4 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -127,7 +127,7 @@ private: */ // bool mbShowAllShapes; - static sal_uInt16 GetDragTypeSdStrId(NavigatorDragType eDT); + static const char* GetDragTypeSdStrId(NavigatorDragType eDT); static OUString GetDragTypeSdBmpId(NavigatorDragType eDT); NavDocInfo* GetDocInfo(); diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc deleted file mode 100644 index 724c976c5f3f..000000000000 --- a/sd/source/ui/inc/res_bmp.hrc +++ /dev/null @@ -1,25 +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 "sfx2/sfx.hrc" -#include "cfgids.hxx" - -#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 -#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc deleted file mode 100644 index abf2acf68755..000000000000 --- a/sd/source/ui/inc/sdstring.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 . - */ -#include <sfx2/sfx.hrc> -#define SID_SD_STRING_START RID_APP_START+300 - -// Texts for search and replace info and question boxes. -#define STR_SAR_WRAP_FORWARD SID_SD_STRING_START+24 -#define STR_SAR_WRAP_BACKWARD SID_SD_STRING_START+25 -#define STR_SAR_WRAP_FORWARD_DRAW SID_SD_STRING_START+26 -#define STR_SAR_WRAP_BACKWARD_DRAW SID_SD_STRING_START+27 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc deleted file mode 100644 index fccad3a6c8a9..000000000000 --- a/sd/source/ui/inc/strings.hrc +++ /dev/null @@ -1,392 +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 "sfx2/sfx.hrc" -#include "cfgids.hxx" - -#define STR_NULL (RID_APP_START+3) -#define STR_INSERTPAGE (RID_APP_START+35) -#define STR_INSERTLAYER (RID_APP_START+37) -#define STR_MODIFYLAYER (RID_APP_START+38) -#define STR_UNDO_REPLACE (RID_APP_START+42) - -/* - * Dummy-Strings, these ResourceIDs: should not be assigned to other strings - * as they're used for popup-menus (a popup-menu and its - * configurations string should have identical ResourceID's!). - * See also: res_bmp.hrc, popup.src - */ - -#define STR_UNDO_CUT (RID_APP_START+59) -#define STR_UNDO_DRAGDROP (RID_APP_START+66) -#define STR_INSERTGRAPHIC (RID_APP_START+67) - -#define STR_DRAGTYPE_URL (RID_APP_START+70) -#define STR_DRAGTYPE_EMBEDDED (RID_APP_START+71) -#define STR_DRAGTYPE_LINK (RID_APP_START+72) -#define STR_GLUE_ESCDIR_SMART (RID_APP_START+73) -#define STR_GLUE_ESCDIR_LEFT (RID_APP_START+74) -#define STR_GLUE_ESCDIR_RIGHT (RID_APP_START+75) -#define STR_GLUE_ESCDIR_TOP (RID_APP_START+76) -#define STR_GLUE_ESCDIR_BOTTOM (RID_APP_START+77) -#define STR_GLUE_ESCDIR_LO (RID_APP_START+78) -#define STR_GLUE_ESCDIR_LU (RID_APP_START+79) -#define STR_GLUE_ESCDIR_RO (RID_APP_START+80) -#define STR_GLUE_ESCDIR_RU (RID_APP_START+81) -#define STR_GLUE_ESCDIR_HORZ (RID_APP_START+82) -#define STR_GLUE_ESCDIR_VERT (RID_APP_START+83) -#define STR_GLUE_ESCDIR_ALL (RID_APP_START+84) - -#define STR_CANT_PERFORM_IN_LIVEMODE (RID_APP_START+85) -#define STR_PUBLISH_BACK (RID_APP_START+86) -#define STR_PUBLISH_NEXT (RID_APP_START+87) -#define STR_PUBLISH_OUTLINE (RID_APP_START+88) -#define STR_UNDO_COLORRESOLUTION (RID_APP_START+89) - -/* keep 90 - 100 free for popup's */ -#define STR_ASK_DELETE_ALL_PICTURES (RID_APP_START+92) -#define STR_WARN_PAGE_EXISTS (RID_APP_START+93) - -#define STR_SLIDE_SORTER_MODE (RID_APP_START+121) -#define STR_NORMAL_MODE (RID_APP_START+122) -#define STR_OUTLINE_MODE (RID_APP_START+123) -#define STR_SLIDE_MASTER_MODE (RID_APP_START+124) -#define STR_NOTES_MASTER_MODE (RID_APP_START+125) - -#define STR_UNDO_BEZCLOSE (RID_APP_START+127) - -#define STR_END_SPELLING_OBJ (RID_APP_START+129) -#define STR_NOTES_MODE (RID_APP_START+135) -#define STR_HANDOUT_MASTER_MODE (RID_APP_START+136) - -#define STR_LINEEND (RID_APP_START+137) -#define STR_DESC_LINEEND (RID_APP_START+138) -#define STR_WARN_NAME_DUPLICATE (RID_APP_START+139) -#define STR_UNDO_COPYOBJECTS (RID_APP_START+140) -#define STR_DESC_NAMEGROUP (RID_APP_START+141) -#define STR_TITLE_NAMEGROUP (RID_APP_START+143) - -#define STR_SNAPDLG_SETLINE (RID_APP_START+144) -#define STR_SNAPDLG_SETPOINT (RID_APP_START+145) -#define STR_POPUP_EDIT_SNAPLINE (RID_APP_START+146) -#define STR_POPUP_EDIT_SNAPPOINT (RID_APP_START+147) - -#define STR_IMPRESS (RID_APP_START+149) -#define STR_IMPRESS_DOCUMENT (RID_APP_START+154) -#define STR_LAYER (RID_APP_START+158) - -#define STR_POPUP_DELETE_SNAPLINE (RID_APP_START+160) -#define STR_POPUP_DELETE_SNAPPOINT (RID_APP_START+161) - -#define STR_EYEDROPPER (RID_APP_START+163) - -#define STR_UNDO_MORPHING (RID_APP_START+164) - -#define STR_IMPRESS_DOCUMENT_FULLTYPE_60 (RID_APP_START+170) - -// IDs for presentation slides -#define STR_AUTOLAYOUT_NONE (RID_APP_START+210) -#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211) -#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+212) -#define STR_AUTOLAYOUT_TITLE (RID_APP_START+213) -#define STR_AUTOLAYOUT_CONTENT (RID_APP_START+214) -#define STR_AUTOLAYOUT_2CONTENT (RID_APP_START+215) -#define STR_AUTOLAYOUT_CONTENT_2CONTENT (RID_APP_START+217) -#define STR_AUTOLAYOUT_2CONTENT_CONTENT (RID_APP_START+218) -#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT (RID_APP_START+220) -#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT (RID_APP_START+221) -#define STR_AUTOLAYOUT_4CONTENT (RID_APP_START+222) -#define STR_AUTOLAYOUT_6CONTENT (RID_APP_START+223) - // FREE -#define STR_AUTOLAYOUT_HANDOUT1 (RID_APP_START+231) -#define STR_AUTOLAYOUT_HANDOUT2 (RID_APP_START+232) -#define STR_AUTOLAYOUT_HANDOUT3 (RID_APP_START+233) -#define STR_AUTOLAYOUT_HANDOUT4 (RID_APP_START+234) -#define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235) -#define STR_AUTOLAYOUT_NOTES (RID_APP_START+236) -#define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237) - -#define STR_DISPLAYMODE_EDITMODES (RID_APP_START+238) -#define STR_DISPLAYMODE_MASTERMODES (RID_APP_START+239) - -#define STR_TRANSFORM (RID_APP_START+240) - -#define STR_EXPORT_HTML_NAME (RID_APP_START+244) -#define STR_TWAIN_NO_SOURCE_UNX (RID_APP_START+262) -#define STR_UNDO_DELETEPAGES (RID_APP_START+265) -#define STR_UNDO_INSERTPAGES (RID_APP_START+266) - -#define STR_ASK_DELETE_LAYER (RID_APP_START+267) -#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT (RID_APP_START+268) -#define STR_WAV_FILE (RID_APP_START+269) -#define STR_MIDI_FILE (RID_APP_START+270) -#define STR_SD_PAGE (RID_APP_START+271) -#define STR_SD_PAGE_COUNT (RID_APP_START+272) -#define STR_SD_PAGE_COUNT_CUSTOM (RID_APP_START+273) - -#define STR_ALL_FILES (RID_APP_START+274) -#define STR_UNDO_INSERT_TEXTFRAME (RID_APP_START+275) -#define STR_ACTION_NOTPOSSIBLE (RID_APP_START+278) -#define STR_DLG_INSERT_PAGES_FROM_FILE (RID_APP_START+279) -#define STR_OVERWRITE_WARNING (RID_APP_START+280) -#define STR_SCALE_OBJECTS (RID_APP_START+281) -#define STR_CREATE_PAGES (RID_APP_START+282) - -#define STR_UNDO_CHANGE_PAGEFORMAT (RID_APP_START+283) -#define STR_UNDO_CHANGE_PAGEBORDER (RID_APP_START+284) - -#define STR_EDIT_OBJ (RID_APP_START+288) - -#define STR_READ_DATA_ERROR (RID_APP_START+290) - -/****************************************************************************** -* The Ids in sdstring.hrc start from (RID_APP_START+300) ! -******************************************************************************/ - -#define STR_DELETE_PAGES (RID_APP_START+332) -#define STR_WARN_PRINTFORMAT_FAILURE (RID_APP_START+333) - -#define STR_IMPORT_GRFILTER_OPENERROR (RID_APP_START+335) -#define STR_IMPORT_GRFILTER_IOERROR (RID_APP_START+336) -#define STR_IMPORT_GRFILTER_FORMATERROR (RID_APP_START+337) -#define STR_IMPORT_GRFILTER_VERSIONERROR (RID_APP_START+338) -#define STR_IMPORT_GRFILTER_FILTERERROR (RID_APP_START+339) -#define STR_IMPORT_GRFILTER_TOOBIG (RID_APP_START+340) - -#define STR_OBJECTS (RID_APP_START+341) -#define STR_END_SPELLING (RID_APP_START+343) -// empty -#define STR_ASK_FOR_CONVERT_TO_BEZIER (RID_APP_START+347) -#define STR_UNDO_CHANGE_PRES_OBJECT (RID_APP_START+349) -#define STR_UNDO_MODIFY_PAGE (RID_APP_START+350) -// empty -#define STR_UNDO_INSERT_FILE (RID_APP_START+352) -#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START+353) -#define STR_UNDO_SET_PRESLAYOUT (RID_APP_START+354) -#define STR_PLAY (RID_APP_START+356) -#define STR_STOP (RID_APP_START+357) -#define STR_UNDO_ORIGINALSIZE (RID_APP_START+359) -#define STR_WARN_SCALE_FAIL (RID_APP_START+365) - -// strings for click-effects (Keep the sequence) -#define STR_CLICK_ACTION_NONE (RID_APP_START+366) -#define STR_CLICK_ACTION_PREVPAGE (RID_APP_START+367) -#define STR_CLICK_ACTION_NEXTPAGE (RID_APP_START+368) -#define STR_CLICK_ACTION_FIRSTPAGE (RID_APP_START+369) -#define STR_CLICK_ACTION_LASTPAGE (RID_APP_START+370) -#define STR_CLICK_ACTION_BOOKMARK (RID_APP_START+371) -#define STR_CLICK_ACTION_DOCUMENT (RID_APP_START+372) -#define STR_CLICK_ACTION_SOUND (RID_APP_START+375) -#define STR_CLICK_ACTION_VERB (RID_APP_START+376) -#define STR_CLICK_ACTION_PROGRAM (RID_APP_START+377) -#define STR_CLICK_ACTION_MACRO (RID_APP_START+378) -// Keep free till at least 380 - -#define STR_EFFECTDLG_SOUND (RID_APP_START+380) -#define STR_EFFECTDLG_PAGE_OBJECT (RID_APP_START+382) -#define STR_EFFECTDLG_DOCUMENT (RID_APP_START+383) -#define STR_EFFECTDLG_PROGRAM (RID_APP_START+384) -#define STR_EFFECTDLG_MACRO (RID_APP_START+385) -#define STR_EFFECTDLG_JUMP (RID_APP_START+386) -#define STR_EFFECTDLG_ACTION (RID_APP_START+387) - -/* Continuation from RID_APP_START+43 to RID_APP_START+58: - * Dummy-Strings, these ResourceIDs should not be assigned to other strings, - * as they're used for popup-menu (a popup-menu and its - * configurations string should have identical ResourceID!). - * See also: res_bmp.hrc, popup.src - */ - -#define STR_INSERT_TEXT (RID_APP_START+432) -#define STR_SLIDE_SINGULAR (RID_APP_START+433) -#define STR_SLIDE_PLURAL (RID_APP_START+434) -#define STR_AU_FILE (RID_APP_START+435) -#define STR_VOC_FILE (RID_APP_START+436) -#define STR_AIFF_FILE (RID_APP_START+437) -#define STR_SVX_FILE (RID_APP_START+438) - -/* stringdefinitions for the Chart-texts -*/ -#define STR_LOAD_PRESENTATION_LAYOUT (RID_APP_START+448) - -#define STR_CLICK_ACTION_STOPPRESENTATION (RID_APP_START+475) - -#define STR_UNDO_EXPAND_PAGE (RID_APP_START+493) -#define STR_UNDO_SUMMARY_PAGE (RID_APP_START+494) - -#define STR_GRAPHIC_DOCUMENT (RID_APP_START+499) -#define STR_GRAPHIC_DOCUMENT_FULLTYPE_60 (RID_APP_START+501) - -#define STR_FIX (RID_APP_START+502) -#define STR_VAR (RID_APP_START+503) -#define STR_STANDARD_NORMAL (RID_APP_START+504) -#define STR_STANDARD_SMALL (RID_APP_START+505) -#define STR_STANDARD_BIG (RID_APP_START+506) -#define STR_FILEFORMAT_NAME_EXT (RID_APP_START+507) -#define STR_FILEFORMAT_FULLPATH (RID_APP_START+508) -#define STR_FILEFORMAT_PATH (RID_APP_START+509) -#define STR_FILEFORMAT_NAME (RID_APP_START+510) - -#define STR_NEW_CUSTOMSHOW (RID_APP_START+512) -#define STR_COPY_CUSTOMSHOW (RID_APP_START+513) - -#define STR_BREAK_METAFILE (RID_APP_START+521) -#define STR_BREAK_FAIL (RID_APP_START+522) - -#define STR_PUBDLG_SAMENAME (RID_APP_START+523) - -#define STR_HTMLATTR_TEXT (RID_APP_START+524) -#define STR_HTMLATTR_LINK (RID_APP_START+525) -#define STR_HTMLATTR_VLINK (RID_APP_START+526) -#define STR_HTMLATTR_ALINK (RID_APP_START+527) - -#define STR_HTMLEXP_NOTES (RID_APP_START+528) -#define STR_HTMLEXP_CONTENTS (RID_APP_START+529) -#define STR_HTMLEXP_CLICKSTART (RID_APP_START+530) -#define STR_HTMLEXP_AUTHOR (RID_APP_START+531) -#define STR_HTMLEXP_EMAIL (RID_APP_START+532) -#define STR_HTMLEXP_HOMEPAGE (RID_APP_START+533) -#define STR_HTMLEXP_INFO (RID_APP_START+534) -#define STR_HTMLEXP_DOWNLOAD (RID_APP_START+536) -#define STR_HTMLEXP_NOFRAMES (RID_APP_START+537) -#define STR_HTMLEXP_FIRSTPAGE (RID_APP_START+538) -#define STR_HTMLEXP_LASTPAGE (RID_APP_START+539) -#define STR_HTMLEXP_SETTEXT (RID_APP_START+540) -#define STR_HTMLEXP_SETGRAPHIC (RID_APP_START+541) -#define STR_HTMLEXP_OUTLINE (RID_APP_START+542) -#define STR_HTMLEXP_NOOUTLINE (RID_APP_START+543) - -#define STR_PRES_SOFTEND (RID_APP_START+550) -#define STR_PRES_PAUSE (RID_APP_START+551) - -#define STR_WEBVIEW_SAVE (RID_APP_START+555) - -#define STR_UNDO_APPLY_3D_FAVOURITE (RID_APP_START+556) - -//free (RID_APP_START+557) - -#define STR_WARNING_NOSOUNDFILE (RID_APP_START+565) - -#define STR_UNDO_GRAFFILTER (RID_APP_START+570) - -#define STR_UNDO_CONVERT_TO_METAFILE (RID_APP_START+571) -#define STR_UNDO_CONVERT_TO_BITMAP (RID_APP_START+572) - -#define STR_HTMLEXP_ERROR_CREATE_FILE (RID_APP_START+578) -#define STR_HTMLEXP_ERROR_OPEN_FILE (RID_APP_START+579) -#define STR_HTMLEXP_ERROR_COPY_FILE (RID_APP_START+580) - -#define STR_PAGE_BACKGROUND_TXT (RID_APP_START+583) -#define STR_PAGE_BACKGROUND_TITLE (RID_APP_START+584) - -#define STR_STATUSBAR_MASTERPAGE (RID_APP_START+600) - -#define STR_TWAIN_NO_SOURCE (RID_APP_START+670) -#define STR_UNDO_VECTORIZE (RID_APP_START+671) - -#define STR_AL_VERT_TITLE_TEXT_CHART (RID_APP_START+672) -#define STR_AL_VERT_TITLE_VERT_OUTLINE (RID_APP_START+673) -#define STR_AL_TITLE_VERT_OUTLINE (RID_APP_START+674) -#define STR_AL_TITLE_VERT_OUTLINE_CLIPART (RID_APP_START+675) - -#define STR_SET_BACKGROUND_PICTURE (RID_APP_START+681) - -#define STR_DESC_RENAMESLIDE (RID_APP_START+682) -#define STR_TITLE_RENAMESLIDE (RID_APP_START+683) - -#define STR_PLACEHOLDER_DESCRIPTION_TITLE (RID_APP_START+684) -#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE (RID_APP_START+685) -#define STR_PLACEHOLDER_DESCRIPTION_FOOTER (RID_APP_START+686) -#define STR_PLACEHOLDER_DESCRIPTION_HEADER (RID_APP_START+687) -#define STR_PLACEHOLDER_DESCRIPTION_DATETIME (RID_APP_START+688) -#define STR_PLACEHOLDER_DESCRIPTION_NUMBER (RID_APP_START+689) -#define STR_PLACEHOLDER_DESCRIPTION_SLIDE (RID_APP_START+690) -#define STR_PLACEHOLDER_DESCRIPTION_NOTES (RID_APP_START+691) - -#define STR_FIELD_PLACEHOLDER_HEADER (RID_APP_START+692) -#define STR_FIELD_PLACEHOLDER_FOOTER (RID_APP_START+693) -#define STR_FIELD_PLACEHOLDER_DATETIME (RID_APP_START+694) -#define STR_FIELD_PLACEHOLDER_NUMBER (RID_APP_START+695) - -#define STR_UNDO_HANGULHANJACONVERSION (RID_APP_START+696) -#define STR_FIELD_PLACEHOLDER_COUNT (RID_APP_START+697) -#define STR_FIELD_PLACEHOLDER_SLIDENAME (RID_APP_START+698) -#define STR_FIELD_PLACEHOLDER_PAGENAME (RID_APP_START+699) - -#define STR_LEFT_PANE_DRAW_TITLE (RID_APP_START+700) -#define STR_LEFT_PANE_IMPRESS_TITLE (RID_APP_START+701) -#define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION (RID_APP_START+711) -#define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION (RID_APP_START+712) -#define STR_TASKPANEL_LAYOUT_MENU_TITLE (RID_APP_START+713) -#define STR_GRAPHICS_STYLE_FAMILY (RID_APP_START+715) -#define STR_PRESENTATIONS_STYLE_FAMILY (RID_APP_START+716) -#define STR_OBJECTS_TREE (RID_APP_START+717) -#define STR_CELL_STYLE_FAMILY (RID_APP_START+718) - -#define STR_NAVIGATOR_SHOW_NAMED_SHAPES (RID_APP_START+719) -#define STR_NAVIGATOR_SHOW_ALL_SHAPES (RID_APP_START+720) -#define STR_NAVIGATOR_SHAPE_BASE_NAME (RID_APP_START+721) - -#define STR_RESET_LAYOUT (RID_APP_START+722) -#define STR_INSERT_TABLE (RID_APP_START+723) -#define STR_INSERT_CHART (RID_APP_START+724) -#define STR_INSERT_PICTURE (RID_APP_START+725) -#define STR_INSERT_MOVIE (RID_APP_START+726) - -#define STRING_DRAG_AND_DROP_PAGES (RID_APP_START+727) -#define STRING_DRAG_AND_DROP_SLIDES (RID_APP_START+728) - -#define STR_PHOTO_ALBUM_EMPTY_WARNING (RID_APP_START+730) -#define STR_PHOTO_ALBUM_TEXTBOX (RID_APP_START+731) - -#define STR_INSERT_3D_MODEL_TITLE (RID_APP_START+732) -#define STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS (RID_APP_START+733) - -#define STR_IMPRESS_PRINT_UI_GROUP_NAME (RID_APP_START+734) -#define STR_IMPRESS_PRINT_UI_PRINT_GROUP (RID_APP_START+736) -#define STR_IMPRESS_PRINT_UI_CONTENT (RID_APP_START+737) -#define STR_IMPRESS_PRINT_UI_CONTENT_CHOICES (RID_APP_START+738) -#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE (RID_APP_START+739) -#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES (RID_APP_START+740) -#define STR_IMPRESS_PRINT_UI_ORDER (RID_APP_START+741) -#define STR_IMPRESS_PRINT_UI_ORDER_CHOICES (RID_APP_START+742) -#define STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT (RID_APP_START+743) -#define STR_IMPRESS_PRINT_UI_IS_PRINT_NAME (RID_APP_START+744) -#define STR_IMPRESS_PRINT_UI_IS_PRINT_DATE (RID_APP_START+745) -#define STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN (RID_APP_START+746) -#define STR_IMPRESS_PRINT_UI_QUALITY (RID_APP_START+748) -#define STR_IMPRESS_PRINT_UI_QUALITY_CHOICES (RID_APP_START+749) -#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS (RID_APP_START+750) -#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES (RID_APP_START+751) -#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW (RID_APP_START+752) -#define STR_IMPRESS_PRINT_UI_BROCHURE (RID_APP_START+753) -#define STR_IMPRESS_PRINT_UI_PAGE_SIDES (RID_APP_START+754) -#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE (RID_APP_START+755) -#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST (RID_APP_START+756) -#define STR_IMPRESS_PRINT_UI_PAPER_TRAY (RID_APP_START+758) -#define STR_IMPRESS_PRINT_UI_PAGE_RANGE (RID_APP_START+759) -#define STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE (RID_APP_START+760) -#define STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE (RID_APP_START+761) -#define STR_DRAW_PRINT_UI_IS_PRINT_NAME (RID_APP_START+762) - - -/****************************************************************************** -* The ids in glob.hrc start at RID_APP_START+750! -******************************************************************************/ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 5f0f1a07a73d..b42d9c2887ca 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -88,7 +88,7 @@ private: void SetActualClickAction( css::presentation::ClickAction eCA ); void SetEditText( OUString const & rStr ); OUString GetEditText( bool bURL = false ); - static sal_uInt16 GetClickActionSdResId( css::presentation::ClickAction eCA ); + static const char* GetClickActionSdResId(css::presentation::ClickAction eCA); public: SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 29b796857e36..654c9a24091f 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -24,7 +24,6 @@ #include <svl/lstner.hxx> #include "EventMultiplexer.hxx" #include "ViewShellBase.hxx" -#include "res_bmp.hrc" namespace sd { diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index ce19b6a25825..81222e4e71da 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -34,7 +34,7 @@ #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 0512139aaf90..4e9a31d69bcf 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -28,7 +28,7 @@ #include "EventMultiplexer.hxx" #include "app.hrc" #include "DrawDocShell.hxx" -#include "res_bmp.hrc" + #include "sdresid.hxx" #include "helpids.h" diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index ef39e00b5fc1..1c6782d424a8 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -22,11 +22,11 @@ #include "app.hrc" #include "drawdoc.hxx" #include "framework/FrameworkHelper.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "glob.hxx" #include "helpids.h" #include "pres.hxx" -#include "res_bmp.hrc" + #include "sdpage.hxx" #include "sdresid.hxx" #include "strings.hrc" @@ -69,7 +69,7 @@ namespace sd { namespace sidebar { struct snewfoil_value_info { const char* msBmpResId; - sal_uInt16 mnStrResId; + const char* mpStrResId; WritingMode meWritingMode; AutoLayout maAutoLayout; }; @@ -78,7 +78,7 @@ static const snewfoil_value_info notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES}, - {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info handout[] = @@ -95,7 +95,7 @@ static const snewfoil_value_info handout[] = AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT9}, - {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info standard[] = @@ -118,7 +118,7 @@ static const snewfoil_value_info standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VTITLE_VCONTENT}, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VCONTENT}, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_2VTEXT}, - {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} + {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; LayoutMenu::LayoutMenu ( @@ -538,7 +538,7 @@ void LayoutMenu::Fill() } Clear(); - for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mnStrResId !=0; i++, pInfo++) + for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mpStrResId != nullptr; i++, pInfo++) { if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical) { @@ -547,7 +547,7 @@ void LayoutMenu::Fill() if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode)) aBmp.Mirror (BmpMirrorFlags::Horizontal); - InsertItem(i, Image(aBmp), SdResId (pInfo->mnStrResId)); + InsertItem(i, Image(aBmp), SdResId(pInfo->mpStrResId)); SetItemData (i, new AutoLayout(pInfo->maAutoLayout)); } } diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index e905b85254bd..a1d3f3f93b7b 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -166,7 +166,7 @@ private: typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData; - Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize); + Image GetPreviewSubstitution(const char* pId, PreviewSize ePreviewSize); void CleanContainer(); }; @@ -867,44 +867,38 @@ SdDrawDocument* MasterPageContainer::Implementation::GetDocument() } Image MasterPageContainer::Implementation::GetPreviewSubstitution ( - sal_uInt16 nId, + const char* pId, PreviewSize ePreviewSize) { const ::osl::MutexGuard aGuard (maMutex); Image aPreview; - switch (nId) + if (strcmp(pId, STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION) == 0) { - case STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION: + Image& rPreview (ePreviewSize==SMALL + ? maSmallPreviewBeingCreated + : maLargePreviewBeingCreated); + if (rPreview.GetSizePixel().Width() == 0) { - Image& rPreview (ePreviewSize==SMALL - ? maSmallPreviewBeingCreated - : maLargePreviewBeingCreated); - if (rPreview.GetSizePixel().Width() == 0) - { - rPreview = maPreviewRenderer.RenderSubstitution( - ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel, - SdResId(STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION)); - } - aPreview = rPreview; + rPreview = maPreviewRenderer.RenderSubstitution( + ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel, + SdResId(STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION)); } - break; - - case STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION: + aPreview = rPreview; + } + else if (strcmp(pId, STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION) == 0) + { + Image& rPreview (ePreviewSize==SMALL + ? maSmallPreviewNotAvailable + : maLargePreviewNotAvailable); + if (rPreview.GetSizePixel().Width() == 0) { - Image& rPreview (ePreviewSize==SMALL - ? maSmallPreviewNotAvailable - : maLargePreviewNotAvailable); - if (rPreview.GetSizePixel().Width() == 0) - { - rPreview = maPreviewRenderer.RenderSubstitution( - ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel, - SdResId(STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION)); - } - aPreview = rPreview; + rPreview = maPreviewRenderer.RenderSubstitution( + ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel, + SdResId(STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION)); } - break; + aPreview = rPreview; } return aPreview; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index edd6d0f19414..982519c1bf2f 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -30,9 +30,9 @@ #include "DrawDocShell.hxx" #include "sdpage.hxx" #include "glob.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" -#include "res_bmp.hrc" + #include "strings.hrc" #include "DrawViewShell.hxx" #include "DrawController.hxx" diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index a0c2e756e42c..bb9f723ff2dd 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -34,14 +34,13 @@ #include "DrawViewShell.hxx" #include "DrawController.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <svx/colorbox.hxx> #include <svx/gallery.hxx> #include <svx/drawitem.hxx> #include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> -#include <tools/resary.hxx> #include <sfx2/sidebar/Theme.hxx> #include "app.hrc" #include <editeng/paperinf.hxx> @@ -62,7 +61,7 @@ #include <sfx2/tabdlg.hxx> #include <algorithm> #include "EventMultiplexer.hxx" -#include "glob.hrc" +#include "strings.hrc" #include <vcl/salbtype.hxx> #include <vcl/EnumContext.hxx> diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 48f6c3a321d4..fcdbc11f8aec 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -24,7 +24,7 @@ #include <unotools/syslocale.hxx> #include <sfx2/viewfrm.hxx> -#include "res_bmp.hrc" + #include "slideshow.hxx" #include "ViewShellBase.hxx" #include "sdresid.hxx" diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 9a7ccda3ae11..8a6516b0714c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -59,8 +59,8 @@ #include <pgjump.hxx> #include "PaneHider.hxx" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" #include <vcl/canvastools.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index c900cdf6e55d..6f2ca506559c 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -54,11 +54,11 @@ #include "FrameView.hxx" #include "DrawDocShell.hxx" #include "sdpage.hxx" -#include "res_bmp.hrc" + #include "sdresid.hxx" #include "strings.hrc" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdmod.hxx" #include "sdxfer.hxx" #include "ViewShellHint.hxx" diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index f98ea9761e27..27773ecd1a54 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -50,7 +50,7 @@ #include "fuexpand.hxx" #include "fusumry.hxx" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "sdresid.hxx" #include "sdxfer.hxx" @@ -67,7 +67,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> #include <svx/svxids.hrc> -#include <svx/svdstr.hrc> +#include <svx/strings.hrc> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <rtl/ustring.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 271ff8ad02fa..c4907d82ffd6 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -35,7 +35,7 @@ #include "drawdoc.hxx" #include "DrawDocShell.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "ViewShellBase.hxx" #include "ViewShellManager.hxx" #include "FrameView.hxx" diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 60fc8565dc03..4a39274fb4e9 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -44,11 +44,11 @@ #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include "res_bmp.hrc" + #include "sdresid.hxx" #include "strings.hrc" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 5fcbb1894b28..f6da3147aa50 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -61,7 +61,7 @@ #include "sdpage.hxx" #include "sdxfer.hxx" #include "helpids.h" -#include "glob.hrc" +#include "strings.hrc" #include "unmodpg.hxx" #include "DrawViewShell.hxx" #include "sdabstdlg.hxx" diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index b17392dc14a8..c3a19e028293 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -28,7 +28,7 @@ #include "view/SlsTheme.hxx" #include "model/SlideSorterModel.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "DrawController.hxx" #include "ViewShellBase.hxx" #include "ViewShellManager.hxx" diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 29c14bf08db1..d2999a2464e8 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -40,7 +40,7 @@ #include "ViewShellBase.hxx" #include "drawdoc.hxx" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdattr.hrc" #include "sdresid.hxx" #include "AccessibleSlideSorterView.hxx" diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 3a98bfcb0cb6..4f480dba0637 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -46,7 +46,7 @@ #include "sdpage.hxx" #include "Window.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include <svl/itempool.hxx> #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index b4d41cc4ddff..3af310378abd 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -24,7 +24,7 @@ #include "view/SlsTheme.hxx" #include "tools/IconCache.hxx" #include "Window.hxx" -#include "res_bmp.hrc" + #include "bitmaps.hlst" namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index a22a14de1afa..dd5c0e164d9f 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "glob.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "view/SlsTheme.hxx" #include "controller/SlsProperties.hxx" diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 3835ca5bd6b2..027ea9937d90 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -23,7 +23,7 @@ #include "view/SlsTheme.hxx" #include "sdpage.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include <vcl/settings.hxx> #include <vcl/help.hxx> diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 987af603506e..feba064cdd19 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -53,7 +53,7 @@ #include "ViewShellBase.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "EventMultiplexer.hxx" diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 20bbc450fad5..f4e6a4b546c3 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -54,7 +54,7 @@ #include "framework/FrameworkHelper.hxx" #include "TableDesignPane.hxx" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "tablefunction.hxx" #include "DrawViewShell.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 139c59cfb507..6da3d85f3ea1 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -37,8 +37,7 @@ #include "app.hrc" #include "createtableobjectbar.hxx" #include "registerinterfaces.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + #include "strings.hrc" #include "DrawDocShell.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 1fc88d296255..006607565e2a 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -44,7 +44,7 @@ #include "app.hrc" #include "strings.hrc" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "unokywds.hxx" #include "unowcntr.hxx" diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index eacd8ade3941..b7de3cd93df0 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -82,7 +82,7 @@ #include <Annotation.hxx> #include <drawdoc.hxx> -#include <glob.hrc> +#include <strings.hrc> #include <sdresid.hxx> #include <sdpage.hxx> diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 8250ac4a692d..7c7f2b911d76 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -71,7 +71,7 @@ #include "DrawDocShell.hxx" #include "helpids.h" #include "glob.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "unolayer.hxx" #include "imapinfo.hxx" #include "EffectMigration.hxx" diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 587014a25042..9758152bee97 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -41,7 +41,7 @@ #include <svl/itemset.hxx> #include <svx/svdmodel.hxx> #include <sdresid.hxx> -#include <glob.hrc> +#include <strings.hrc> #include <sdpage.hxx> #include <unoprnms.hxx> #include <sdattr.hxx> @@ -63,7 +63,7 @@ #include "ViewShell.hxx" #include "DrawViewShell.hxx" #include "unoobj.hxx" -#include "res_bmp.hrc" + #include "strings.hxx" #include "bitmaps.hlst" #include "unokywds.hxx" diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index a6966be40195..358a17ea0879 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "DocumentRenderer.hxx" +#include "DocumentRenderer.hrc" #include "drawdoc.hxx" #include "optsitem.hxx" @@ -47,7 +48,6 @@ #include <svx/svdopath.hxx> #include <svx/xlnclit.hxx> #include <toolkit/awt/vclxdevice.hxx> -#include <tools/resary.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/msgbox.hxx> #include <unotools/moduleoptions.hxx> @@ -395,7 +395,7 @@ namespace { SdResId(STR_IMPRESS_PRINT_UI_CONTENT), aHelpIds, "PageContentType" , - CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES), + CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES)), 0) ); @@ -420,7 +420,7 @@ namespace { SdResId(STR_IMPRESS_PRINT_UI_ORDER), aHelpIds, "SlidesPerPageOrder" , - CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES), + CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_ORDER_CHOICES)), 0, Sequence< sal_Bool >(), aSlidesPerPageOpt ) @@ -486,7 +486,7 @@ namespace { "", aHelpIds, "Quality" , - CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES), + CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES)), 0) ); @@ -510,7 +510,8 @@ namespace { "", aHelpIds, "PageOptions" , - CreateChoice(mbImpress ? STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES : STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW), + mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES)) : + CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW)), 0, Sequence< sal_Bool >(), aPageOptionsOpt @@ -543,7 +544,7 @@ namespace { SdResId(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE), aHelpIds, "PrintProspectInclude" , - CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST), + CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST)), 0, Sequence< sal_Bool >(), aIncludeOpt @@ -612,9 +613,8 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(aWidgetIds, "", aHelpIds, aPrintRangeName, - CreateChoice(mbImpress - ? STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE - : STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE), + mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE)) : + CreateChoice(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE)), nPrintRange ) ); // create a an Edit dependent on "Pages" selected @@ -631,23 +631,18 @@ namespace { maProperties.push_back( aVal ); } - static Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId) + static Sequence<OUString> CreateChoice(const char** pResourceId, size_t nCount) { - ResId aResourceId(nResourceId, *SD_MOD()->GetResMgr()); - ResStringArray aChoiceStrings (aResourceId); - - const sal_uInt32 nCount (aChoiceStrings.Count()); Sequence<OUString> aChoices (nCount); - for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) - aChoices[nIndex] = aChoiceStrings.GetString(nIndex); - + for (size_t nIndex=0; nIndex < nCount; ++nIndex) + aChoices[nIndex] = SdResId(pResourceId[nIndex]); return aChoices; } Sequence<OUString> GetSlidesPerPageSequence() { const Sequence<OUString> aChoice ( - CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES)); + CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES))); maSlidesPerPage.clear(); maSlidesPerPage.push_back(0); // first is using the default for (sal_Int32 nIndex=1,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex) diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src deleted file mode 100644 index c5c6852e35a6..000000000000 --- a/sd/source/ui/view/DocumentRenderer.src +++ /dev/null @@ -1,181 +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 "app.hrc" -#include "strings.hrc" - -String STR_IMPRESS_PRINT_UI_GROUP_NAME -{ - Text [en-US] = "%PRODUCTNAME %s"; -}; -String STR_IMPRESS_PRINT_UI_PRINT_GROUP -{ - Text [ en-US ] = "Print"; -}; -String STR_IMPRESS_PRINT_UI_CONTENT -{ - Text [ en-US ] = "Document"; -}; -StringArray STR_IMPRESS_PRINT_UI_CONTENT_CHOICES -{ - ItemList [ en-US ] = - { - < "Slides" ; > ; - < "Handouts" ; > ; - < "Notes" ; > ; - < "Outline" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_SLIDESPERPAGE -{ - Text [ en-US ] = "Slides per page" ; -}; -StringArray STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES -{ - ItemList [ en-US ] = - { - < "According to layout" ; > ; - < "1" ; > ; - < "2" ; > ; - < "3" ; > ; - < "4" ; > ; - < "6" ; > ; - < "9" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_ORDER -{ - Text [ en-US ] = "Order" ; -}; -StringArray STR_IMPRESS_PRINT_UI_ORDER_CHOICES -{ - ItemList [ en-US ] = - { - < "Left to right, then down" ; > ; - < "Top to bottom, then right" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT -{ - Text [ en-US ] = "~Contents"; -}; -String STR_IMPRESS_PRINT_UI_IS_PRINT_NAME -{ - Text [ en-US ] = "~Slide name"; -}; -String STR_DRAW_PRINT_UI_IS_PRINT_NAME -{ - Text [ en-US ] = "P~age name"; -}; -String STR_IMPRESS_PRINT_UI_IS_PRINT_DATE -{ - Text [ en-US ] = "~Date and time"; -}; -String STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN -{ - Text [ en-US ] = "Hidden pages"; -}; -String STR_IMPRESS_PRINT_UI_QUALITY -{ - Text [ en-US ] = "Color"; -}; -StringArray STR_IMPRESS_PRINT_UI_QUALITY_CHOICES -{ - ItemList [ en-US ] = - { - < "Original colors" ; > ; - < "Grayscale" ; > ; - < "Black & white" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_PAGE_OPTIONS -{ - Text [ en-US ] = "~Size"; -}; -StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES -{ - ItemList [ en-US ] = - { - < "Original size" ; > ; - < "Fit to printable page" ; > ; - < "Distribute on multiple sheets of paper" ; > ; - < "Tile sheet of paper with repeated slides" ; > ; - }; -}; -StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW -{ - ItemList [ en-US ] = - { - < "Original size" ; > ; - < "Fit to printable page" ; > ; - < "Distribute on multiple sheets of paper" ; > ; - < "Tile sheet of paper with repeated pages" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_BROCHURE -{ - Text [en-US] = "Brochure"; -}; -String STR_IMPRESS_PRINT_UI_PAGE_SIDES -{ - Text [ en-US ] = "Page sides"; -}; -String STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE -{ - Text [ en-US ] = "Include"; -}; -StringArray STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST -{ - ItemList [ en-US ] = - { - < "All pages" ; > ; - < "Front sides / right pages" ; > ; - < "Back sides / left pages" ; > ; - }; -}; - -String STR_IMPRESS_PRINT_UI_PAPER_TRAY -{ - Text [ en-US ] = "~Use only paper tray from printer preferences"; -}; -String STR_IMPRESS_PRINT_UI_PAGE_RANGE -{ - Text [en-US] = "Print range"; -}; -StringArray STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE -{ - ItemList [ en-US ] = - { - < "~All slides"; >; - < "~Slides"; >; - < "Se~lection"; >; - }; -}; - -StringArray STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE -{ - ItemList [ en-US ] = - { - < "~All pages"; >; - < "Pa~ges"; >; - < "Se~lection"; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index eb9b6be057b6..2cc7b4c26672 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -36,8 +36,8 @@ #include <sfx2/objface.hxx> #include "app.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "strings.hrc" #include "DrawDocShell.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index f2413042fd6a..11de79bcfa8a 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -30,8 +30,8 @@ #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include "app.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "strings.hrc" #include "DrawDocShell.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 0b3c8fcdeda7..9b2619ae4e14 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -53,7 +53,6 @@ #include <tools/diagnose_ex.h> #include "strings.hrc" -#include "sdstring.hrc" #include <editeng/outliner.hxx> #include "sdpage.hxx" #include "sdmod.hxx" @@ -1228,15 +1227,15 @@ bool SdOutliner::ShowWrapArroundDialog() // The question text depends on the search direction. bool bImpress = mpDrawDocument && mpDrawDocument->GetDocumentType() == DocumentType::Impress; - sal_uInt16 nStringId; + const char* pStringId; if (mbDirectionIsForward) - nStringId = bImpress ? STR_SAR_WRAP_FORWARD : STR_SAR_WRAP_FORWARD_DRAW; + pStringId = bImpress ? STR_SAR_WRAP_FORWARD : STR_SAR_WRAP_FORWARD_DRAW; else - nStringId = bImpress ? STR_SAR_WRAP_BACKWARD : STR_SAR_WRAP_BACKWARD_DRAW; + pStringId = bImpress ? STR_SAR_WRAP_BACKWARD : STR_SAR_WRAP_BACKWARD_DRAW; // Pop up question box that asks the user whether to wrap around. // The dialog is made modal with respect to the whole application. - ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(nStringId)); + ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(pStringId)); aQuestionBox->SetImage(QueryBox::GetStandardImage()); sal_uInt16 nBoxResult = ShowModalMessageBox(*aQuestionBox.get()); diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index a48d30d9a72d..8c1cf4e6bfc9 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -28,7 +28,7 @@ #include "sdpage.hxx" #include "sdxfer.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 6e98bf784369..9481668f9e7e 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -26,7 +26,7 @@ #include "sdresid.hxx" #include "app.hrc" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "slideshow.hxx" #include "unokywds.hxx" #include <svx/svxids.hrc> diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 9f210c1ce7d2..a59b1d8021a2 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -24,7 +24,7 @@ #include "sdpage.hxx" #include "drawdoc.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" #include "strings.hrc" #include "helpids.h" diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 314e110b8b16..87957dde5256 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -41,10 +41,10 @@ #include "stlsheet.hxx" #include <svx/svdoutl.hxx> -#include <svx/svdstr.hrc> +#include <svx/strings.hrc> #include <svx/dialmgr.hxx> -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "View.hxx" #include "sdattr.hxx" diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index bf52bffe3f0b..dac03c96d49e 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -33,8 +33,8 @@ #include "sdresid.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "strings.hrc" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index de7c1e9db631..26334b02f4b5 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -52,8 +52,8 @@ #include <sfx2/objface.hxx> #include "app.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "drawdoc.hxx" #include "DrawViewShell.hxx" diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index d7b439d12169..f453acd062ed 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -57,7 +57,7 @@ #include <editeng/cmapitem.hxx> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "prlayout.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 23e21891e2d2..2b6c952d2d2b 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -47,9 +47,9 @@ #include "view/viewoverlaymanager.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" -#include "res_bmp.hrc" + #include "strings.hrc" #include "helpids.h" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 51bcc0a2388c..a4b00f47357a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -112,7 +112,7 @@ #include <svl/whiter.hxx> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "framework/FrameworkHelper.hxx" @@ -1358,14 +1358,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( !bDone ) { + ::sd::Window* pWindow = GetActiveWindow(); #ifndef UNX - const sal_uInt16 nId = STR_TWAIN_NO_SOURCE; + ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_TWAIN_NO_SOURCE))->Execute(); #else - const sal_uInt16 nId = STR_TWAIN_NO_SOURCE_UNX; + ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_TWAIN_NO_SOURCE_UNX))->Execute(); #endif - - ::sd::Window* pWindow = GetActiveWindow(); - ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(nId))->Execute(); } else { @@ -1821,6 +1819,20 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_SHOW_NEXT_LEVEL: { + const char* STR_PRESOBJ_MPOUTLINE_ARY[] = + { + STR_PRESOBJ_MPOUTLINE, + STR_PRESOBJ_MPOUTLLAYER2, + STR_PRESOBJ_MPOUTLLAYER3, + STR_PRESOBJ_MPOUTLLAYER4, + STR_PRESOBJ_MPOUTLLAYER5, + STR_PRESOBJ_MPOUTLLAYER6, + STR_PRESOBJ_MPOUTLLAYER7, + STR_PRESOBJ_MPNOTESTITLE, + STR_PRESOBJ_MPNOTESTEXT, + STR_PRESOBJ_NOTESTEXT + }; + ESelection aSel; // fdo#78151 editing a PRESOBJ_OUTLINE in a master page ? ::Outliner* pOL = GetOutlinerForMasterPageOutlineTextObj(aSel); @@ -1835,7 +1847,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (nDepth != sal_uInt16(-1) && nDepth < 8) { sal_uInt16 nNewDepth = nDepth+1; - pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE+nNewDepth), EE_PARA_APPEND, nNewDepth); + pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE_ARY[nNewDepth]), EE_PARA_APPEND, nNewDepth); } } } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 73ccbfd99004..ba75f71d124d 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -52,9 +52,9 @@ #include "optsitem.hxx" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "sdundogr.hxx" #include "undopage.hxx" diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 32439b7abca9..3e9134efcef9 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -40,9 +40,9 @@ #include <vcl/cursor.hxx> #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "DrawDocShell.hxx" #include "drawdoc.hxx" #include "Window.hxx" diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 9ba7f6bb4dce..b433d25e924e 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -37,8 +37,8 @@ #include "LayerTabBar.hxx" #include "strings.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "app.hrc" #include "helpids.h" #include "optsitem.hxx" diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 97a595cc1abc..99f5bd398c48 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -72,8 +72,8 @@ #include <sfx2/viewfrm.hxx> #include "app.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "PresentationViewShell.hxx" #include "Outliner.hxx" diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 80cd59e7107d..74d6e39bafb3 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -50,7 +50,7 @@ #include "view/viewoverlaymanager.hxx" #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "sdpage.hxx" #include "FrameView.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index c22a012ae94e..403e67b330d7 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -41,8 +41,8 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "Outliner.hxx" #include "Window.hxx" #include "sdmod.hxx" diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 70fc761fdd0e..9699b1c343eb 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -67,9 +67,9 @@ #include "ViewShellHint.hxx" #include "framework/FrameworkHelper.hxx" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "drawdoc.hxx" #include "fusel.hxx" #include "futext.hxx" diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 7b16b72e9ba5..d31bfdbd48d1 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -36,8 +36,8 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "SpellDialogChildWindow.hxx" #include "sdresid.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index d4e7ccdea3aa..8db33b353ae2 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -37,7 +37,7 @@ #include "sdmod.hxx" #include "sdresid.hxx" #include "pres.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdiocmpt.hxx" #include "framework/FrameworkHelper.hxx" #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 14b9022abc1c..1d71af0e9539 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -63,8 +63,8 @@ #include "optsitem.hxx" #include "strings.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "Outliner.hxx" #include "Window.hxx" #include "TextObjectBar.hxx" diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index e17bf1877ba8..024a88a16e22 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -58,7 +58,7 @@ #include "pres.hxx" #include "OutlineViewShell.hxx" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "Outliner.hxx" #include "strings.hrc" diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 392ec7619ef5..67b3348226e1 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -39,7 +39,7 @@ #include "drawview.hxx" #include "app.hrc" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "ViewShellBase.hxx" #include "FactoryIds.hxx" diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index d634fa8d4d80..500f183b6a0a 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -63,7 +63,7 @@ #include "DrawDocShell.hxx" #include "sdmod.hxx" #include "sdpage.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "DrawViewShell.hxx" #include "futext.hxx" diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 852208426834..189a76e83314 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -49,7 +49,7 @@ #include "navigatr.hxx" #include "anminfo.hxx" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdxfer.hxx" #include "sdresid.hxx" #include "sdmod.hxx" diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 4f8b8be7fec2..4ddb23e17747 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -61,7 +61,7 @@ #include <svtools/soerr.hxx> #include <sfx2/ipclient.hxx> #include <svx/svdoashp.hxx> -#include "glob.hrc" +#include "strings.hrc" #include <config_features.h> @@ -391,7 +391,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void) if( !mpViewSh ) return; - SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), RID_SO_ERRCTX ); + SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), getRID_SO_ERRCTX() ); ErrCode nError = ERRCODE_NONE; ::std::vector< OUString >::const_iterator aIter( maDropFileVector.begin() ); diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 7b60cc3796d5..8db35425a4fe 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -27,8 +27,8 @@ #include "sdattr.hxx" #include "sdmod.hxx" #include "app.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "DrawViewShell.hxx" #include "GraphicViewShell.hxx" #include "helpids.h" diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index f0445646fff0..c0343a70b548 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -26,7 +26,7 @@ #include "strings.hrc" #include "strings.hxx" #include "glob.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" #include "unmodpg.hxx" diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 7e28f6723cf5..f6ef6ba44904 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -25,8 +25,6 @@ #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> -#include <tools/rcid.h> - #include <vcl/help.hxx> #include <vcl/lazydelete.hxx> @@ -39,11 +37,11 @@ #include "view/viewoverlaymanager.hxx" -#include "res_bmp.hrc" + #include "DrawDocShell.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "bitmaps.hlst" #include "sdresid.hxx" @@ -61,7 +59,7 @@ namespace sd { class ImageButtonHdl; static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; -static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; +static const char* gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; static const OUStringLiteral aSmallPlaceHolders[] = { diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index e0b40d1d1515..4e06cd625566 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -718,7 +718,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { ErrCode aErrCode = ERRCODE_NONE; - SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX); + SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), getRID_SO_ERRCTX()); bool bAbort = false; GetDocSh()->SetWaitCursor( true ); SfxViewShell* pViewShell = GetViewShell(); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 5f342906d994..f346ab12529b 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -24,7 +24,7 @@ #include "GraphicViewShellBase.hxx" #include <sfx2/viewfrm.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <com/sun/star/lang/Locale.hpp> #include <svtools/svtresid.hxx> #include <utility> @@ -32,8 +32,8 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "sdabstdlg.hxx" #include "fupoor.hxx" diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index ef5e71171ad6..b1f7ce840bcc 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -44,7 +44,7 @@ #include "app.hrc" #include "helpids.h" #include "strings.hrc" -#include "res_bmp.hrc" + #include "OutlineView.hxx" #include "Client.hxx" #include "sdresid.hxx" @@ -89,7 +89,7 @@ #include <editeng/editview.hxx> #include <editeng/editeng.hxx> #include <svl/poolitem.hxx> -#include <glob.hrc> +#include <strings.hrc> #include "strings.hxx" #include "AccessibleDocumentViewBase.hxx" |