diff options
Diffstat (limited to 'sd')
25 files changed, 116 insertions, 116 deletions
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 7b89fe57a994..6a89ca2d647b 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -38,11 +38,6 @@ #define STR_PRESOBJ_ORGCHART RID_GLOB_START+11 #define STR_PRESOBJ_TABLE RID_GLOB_START+12 -#define STR_LAYOUT_TITLE RID_GLOB_START+27 -#define STR_LAYOUT_OUTLINE RID_GLOB_START+28 -#define STR_LAYOUT_BACKGROUNDOBJECTS RID_GLOB_START+29 -#define STR_LAYOUT_BACKGROUND RID_GLOB_START+30 -#define STR_LAYOUT_NOTES RID_GLOB_START+31 #define STR_PRESOBJ_MPTITLE RID_GLOB_START+32 #define STR_PRESOBJ_MPOUTLINE RID_GLOB_START+33 #define STR_PRESOBJ_MPOUTLLAYER2 RID_GLOB_START+34 @@ -60,7 +55,7 @@ #define STR_HANDOUT RID_GLOB_START+48 #define STR_UNDO_MOVEPAGES RID_GLOB_START+52 -#define STR_LAYOUT_SUBTITLE RID_GLOB_START+54 +//free #define STR_POOLSHEET_OBJWITHARROW RID_GLOB_START+55 #define STR_POOLSHEET_OBJWITHSHADOW RID_GLOB_START+56 #define STR_POOLSHEET_OBJWITHOUTFILL RID_GLOB_START+57 diff --git a/sd/inc/strings.hxx b/sd/inc/strings.hxx new file mode 100644 index 000000000000..3a5a9ef86ce9 --- /dev/null +++ b/sd/inc/strings.hxx @@ -0,0 +1,23 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#ifndef INCLUDED_SD_INC_STRINGS_HRC +#define INCLUDED_SD_INC_STRINGS_HRC + +/* do not translate */ +#define STR_LAYOUT_TITLE "Titel" +#define STR_LAYOUT_OUTLINE "Gliederung" +#define STR_LAYOUT_BACKGROUND "Hintergrund" +#define STR_LAYOUT_BACKGROUNDOBJECTS "Hintergrundobjekte" +#define STR_LAYOUT_NOTES "Notizen" +#define STR_LAYOUT_SUBTITLE "Untertitel" +#define STR_HTMLEXP_DEFAULT_EXTENSION ".html" +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 7c0c32f4dfa1..239db2a88dc1 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -63,6 +63,7 @@ #include "ViewShellBase.hxx" #include "cfgids.hxx" #include "strings.hrc" +#include "strings.hxx" using namespace ::com::sun::star; @@ -1448,7 +1449,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, else { OUStringBuffer aBuf(rLayoutName); - aBuf.append(SD_LT_SEPARATOR).append(SdResId(STR_LAYOUT_OUTLINE).toString()); + aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE); OUString aSearchFor(aBuf.makeStringAndClear()); for (sal_uInt16 nMP = 0; nMP < pSourceDoc->GetMasterPageCount(); ++nMP) @@ -1523,7 +1524,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, OUString aTemp(aTargetNewLayoutName); aTemp += SD_LT_SEPARATOR; - aTemp += SD_RESSTR(STR_LAYOUT_OUTLINE); + aTemp += STR_LAYOUT_OUTLINE; pMaster->SetName(aTargetNewLayoutName); pMaster->SetLayoutName(aTemp); @@ -1801,7 +1802,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, { // Find a new name for the layout OUString aName(createNewMasterPageLayoutName(*this)); - OUString aPageLayoutName(aName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE)); + OUString aPageLayoutName(aName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE); // Generate new stylesheets static_cast<SdStyleSheetPool*>( mxStyleSheetPool.get())->CreateLayoutStyleSheets(aName); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index adfaba482e30..7fe0b5b5119f 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -107,6 +107,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <svl/itemset.hxx> #include "app.hrc" +#include "strings.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1100,7 +1101,7 @@ void SdDrawDocument::RenameLayoutTemplate(const OUString& rOldLayoutName, const // Now set the layout name of the drawing and the notes page, as well as // their master pages. OUString aPageLayoutName(rNewName); - aPageLayoutName += aSep + SD_RESSTR(STR_LAYOUT_OUTLINE); + aPageLayoutName += aSep + STR_LAYOUT_OUTLINE; // Inform all text objects on pages that use the renamed layout and set the // new name. diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src index 86aea171dc9c..459e194381e1 100644 --- a/sd/source/core/glob.src +++ b/sd/source/core/glob.src @@ -145,31 +145,6 @@ String STR_PRESOBJ_TABLE { Text [ en-US ] = "Double-click to add a Spreadsheet" ; }; -/* do not translate */ -String STR_LAYOUT_TITLE -{ - Text = "Titel" ; -}; -/* do not translate */ -String STR_LAYOUT_OUTLINE -{ - Text = "Gliederung" ; -}; -/* do not translate */ -String STR_LAYOUT_BACKGROUND -{ - Text = "Hintergrund" ; -}; -/* do not translate */ -String STR_LAYOUT_BACKGROUNDOBJECTS -{ - Text = "Hintergrundobjekte" ; -}; -/* do not translate */ -String STR_LAYOUT_NOTES -{ - Text = "Notizen" ; -}; String STR_LAYOUT_DEFAULT_NAME { Text [ en-US ] = "Default" ; @@ -186,11 +161,6 @@ String STR_UNDO_MOVEPAGES { Text [ en-US ] = "Move slides" ; }; -/* do not translate */ -String STR_LAYOUT_SUBTITLE -{ - Text = "Untertitel" ; -}; String STR_POOLSHEET_MEASURE { Text [ en-US ] = "Dimension Line" ; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 907b96ee8963..9852f7a4848b 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -70,6 +70,7 @@ #include "sdresid.hxx" #include "stlsheet.hxx" #include "glob.hrc" +#include "strings.hxx" #include "bitmaps.hlst" #include "glob.hxx" #include "helpids.h" @@ -127,8 +128,8 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage) // The name of the layout of the page is used by SVDRAW to determine the // presentation template of the outline objects. Therefore, it already // contains the designator for the outline (STR_LAYOUT_OUTLINE). - OUStringBuffer aBuf(SdResId(STR_LAYOUT_DEFAULT_NAME).toString()); - aBuf.append(SD_LT_SEPARATOR).append(SdResId(STR_LAYOUT_OUTLINE).toString()); + OUStringBuffer aBuf(SdResId(STR_LAYOUT_DEFAULT_NAME)); + aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE); maLayoutName = aBuf.makeStringAndClear(); Size aPageSize(GetSize()); @@ -617,7 +618,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const aName = aName.copy(0, nPos); } - aName += SD_RESSTR(STR_LAYOUT_BACKGROUND); + aName += STR_LAYOUT_BACKGROUND; SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool(); SfxStyleSheetBase* pResult = pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE); @@ -644,22 +645,22 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const break; case PRESOBJ_TITLE: - aName += SD_RESSTR(STR_LAYOUT_TITLE); + aName += STR_LAYOUT_TITLE; break; case PRESOBJ_NOTES: - aName += SD_RESSTR(STR_LAYOUT_NOTES); + aName += STR_LAYOUT_NOTES; break; case PRESOBJ_TEXT: - aName += SD_RESSTR(STR_LAYOUT_SUBTITLE); + aName += STR_LAYOUT_SUBTITLE; break; case PRESOBJ_HEADER: case PRESOBJ_FOOTER: case PRESOBJ_DATETIME: case PRESOBJ_SLIDENUMBER: - aName += SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS); + aName += STR_LAYOUT_BACKGROUNDOBJECTS; break; default: @@ -681,11 +682,12 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const if( nIndex != -1 ) aStyleName = aStyleName.copy(0, nIndex + aSep.getLength()); - sal_uInt16 nNameId; + const char *pNameId; + bool bOutline = false; switch( nHelpId ) { - case HID_PSEUDOSHEET_TITLE: nNameId = STR_LAYOUT_TITLE; break; - case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_LAYOUT_SUBTITLE; break; + case HID_PSEUDOSHEET_TITLE: pNameId = STR_LAYOUT_TITLE; break; + case HID_PSEUDOSHEET_SUBTITLE: pNameId = STR_LAYOUT_SUBTITLE; break; case HID_PSEUDOSHEET_OUTLINE1: case HID_PSEUDOSHEET_OUTLINE2: case HID_PSEUDOSHEET_OUTLINE3: @@ -694,17 +696,17 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const case HID_PSEUDOSHEET_OUTLINE6: case HID_PSEUDOSHEET_OUTLINE7: case HID_PSEUDOSHEET_OUTLINE8: - case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_LAYOUT_OUTLINE; break; - case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_LAYOUT_BACKGROUNDOBJECTS; break; - case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_LAYOUT_BACKGROUND; break; - case HID_PSEUDOSHEET_NOTES: nNameId = STR_LAYOUT_NOTES; break; + case HID_PSEUDOSHEET_OUTLINE9: pNameId = STR_LAYOUT_OUTLINE; bOutline = true; break; + case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: pNameId = STR_LAYOUT_BACKGROUNDOBJECTS; break; + case HID_PSEUDOSHEET_BACKGROUND: pNameId = STR_LAYOUT_BACKGROUND; break; + case HID_PSEUDOSHEET_NOTES: pNameId = STR_LAYOUT_NOTES; break; default: OSL_FAIL( "SdPage::getPresentationStyle(), illegal argument!" ); return nullptr; } - aStyleName += SD_RESSTR( nNameId ); - if( nNameId == STR_LAYOUT_OUTLINE ) + aStyleName += OUString::createFromAscii(pNameId); + if (bOutline) { aStyleName += " "; aStyleName += OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE )); diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 33c736b7162e..977038901c9a 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -42,6 +42,7 @@ #include "anminfo.hxx" #include "strings.hrc" +#include "strings.hxx" #include "DrawDocShell.hxx" #include <tools/tenccvt.hxx> @@ -84,7 +85,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, \********************************************************************/ OUString aOldLayoutName(maLayoutName); // merken OUStringBuffer aBuf(rLayoutName); - aBuf.append(SD_LT_SEPARATOR).append(SdResId(STR_LAYOUT_OUTLINE).toString()); + aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE); maLayoutName = aBuf.makeStringAndClear(); /********************************************************************* diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 9bb4a7bad92f..64e894c97cb5 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -66,6 +66,7 @@ #include "helpids.h" #include <svl/itemset.hxx> #include "app.hrc" +#include "strings.hxx" #include <com/sun/star/drawing/LineStyle.hpp> @@ -143,7 +144,7 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName) { OUString aName(rLayoutName); aName += SD_LT_SEPARATOR; - aName += SD_RESSTR(STR_LAYOUT_TITLE); + aName += STR_LAYOUT_TITLE; SfxStyleSheetBase* pResult = Find(aName, SD_STYLE_FAMILY_MASTERPAGE); return pResult; } @@ -159,7 +160,7 @@ void SdStyleSheetPool::CreateOutlineSheetList (const OUString& rLayoutName, std: { OUString aName(rLayoutName); aName += SD_LT_SEPARATOR; - aName += SD_RESSTR(STR_LAYOUT_OUTLINE); + aName += STR_LAYOUT_OUTLINE; for (sal_Int32 nSheet = 1; nSheet < 10; nSheet++) { @@ -207,7 +208,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool /************************************************************************** * outline levels **************************************************************************/ - OUString aName(SD_RESSTR(STR_LAYOUT_OUTLINE)); + OUString aName(STR_LAYOUT_OUTLINE); OUString aHelpFile; SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE ); @@ -330,7 +331,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool /************************************************************************** * Title **************************************************************************/ - aName = aPrefix + SD_RESSTR(STR_LAYOUT_TITLE); + aName = aPrefix + STR_LAYOUT_TITLE; if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { @@ -376,7 +377,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool /************************************************************************** * Subtitle **************************************************************************/ - aName = aPrefix + SD_RESSTR(STR_LAYOUT_SUBTITLE); + aName = aPrefix + STR_LAYOUT_SUBTITLE; if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { @@ -425,7 +426,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool /************************************************************************** * Notes **************************************************************************/ - aName = aPrefix + SD_RESSTR(STR_LAYOUT_NOTES); + aName = aPrefix + STR_LAYOUT_NOTES; if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { @@ -470,7 +471,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool /************************************************************************** * Background objects **************************************************************************/ - aName = aPrefix + SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS); + aName = aPrefix + STR_LAYOUT_BACKGROUNDOBJECTS; if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { @@ -492,7 +493,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool /************************************************************************** * Background **************************************************************************/ - aName = aPrefix + SD_RESSTR(STR_LAYOUT_BACKGROUND); + aName = aPrefix + STR_LAYOUT_BACKGROUND; if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { @@ -796,16 +797,16 @@ void SdStyleSheetPool::CopyLayoutSheets(const OUString& rLayoutName, SdStyleShee void SdStyleSheetPool::CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) { OUString aPrefix(rLayoutName + SD_LT_SEPARATOR); - OUString aName(SD_RESSTR(STR_LAYOUT_OUTLINE)); + OUString aName(STR_LAYOUT_OUTLINE); for (sal_Int32 nLevel = 1; nLevel < 10; nLevel++) aNameList.push_back( aPrefix + aName + " " + OUString::number( nLevel ) ); - aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_TITLE) ); - aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_SUBTITLE) ); - aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_NOTES) ); - aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS) ); - aNameList.push_back( aPrefix + SD_RESSTR(STR_LAYOUT_BACKGROUND) ); + aNameList.push_back(aPrefix + STR_LAYOUT_TITLE); + aNameList.push_back(aPrefix + STR_LAYOUT_SUBTITLE); + aNameList.push_back(aPrefix + STR_LAYOUT_NOTES); + aNameList.push_back(aPrefix + STR_LAYOUT_BACKGROUNDOBJECTS); + aNameList.push_back(aPrefix + STR_LAYOUT_BACKGROUND); } /************************************************************************* diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 7dd555bf1d7c..576c17805ce9 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -48,6 +48,7 @@ #include "stlpool.hxx" #include "glob.hrc" #include "app.hrc" +#include "strings.hxx" #include "glob.hxx" #include "helpids.h" #include "DrawViewShell.hxx" @@ -418,23 +419,23 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_TITLE))) { - aInternalName = OUString(SdResId(STR_LAYOUT_TITLE)); + aInternalName = STR_LAYOUT_TITLE; } else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE))) { - aInternalName = OUString(SdResId(STR_LAYOUT_SUBTITLE)); + aInternalName = STR_LAYOUT_SUBTITLE; } else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUND))) { - aInternalName = OUString(SdResId(STR_LAYOUT_BACKGROUND)); + aInternalName = STR_LAYOUT_BACKGROUND; } - else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))) + else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS))) { - aInternalName = OUString(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS)); + aInternalName = STR_LAYOUT_BACKGROUNDOBJECTS; } - else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_NOTES))) + else if (aStyleName == OUString(SdResId(STR_PSEUDOSHEET_NOTES))) { - aInternalName = OUString(SdResId(STR_LAYOUT_NOTES)); + aInternalName = STR_LAYOUT_NOTES; } else { @@ -443,7 +444,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const if (nPos >= 0) { OUString aNumStr(aStyleName.copy(aOutlineStr.getLength())); - aInternalName = OUString(SdResId(STR_LAYOUT_OUTLINE)); + aInternalName = OUString(STR_LAYOUT_OUTLINE); aInternalName += aNumStr; } } @@ -479,29 +480,29 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const aStyleName = aStyleName.copy (aStyleName.indexOf(aSep) + aSep.getLength()); } - if (aStyleName == OUString(SdResId(STR_LAYOUT_TITLE))) + if (aStyleName == STR_LAYOUT_TITLE) { aStyleName = OUString(SdResId(STR_PSEUDOSHEET_TITLE)); } - else if (aStyleName == OUString(SdResId(STR_LAYOUT_SUBTITLE))) + else if (aStyleName == STR_LAYOUT_SUBTITLE) { aStyleName = OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE)); } - else if (aStyleName == OUString(SdResId(STR_LAYOUT_BACKGROUND))) + else if (aStyleName == STR_LAYOUT_BACKGROUND) { aStyleName = OUString(SdResId(STR_PSEUDOSHEET_BACKGROUND)); } - else if (aStyleName == OUString(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS))) + else if (aStyleName == STR_LAYOUT_BACKGROUNDOBJECTS) { aStyleName = OUString(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS)); } - else if (aStyleName == OUString(SdResId(STR_LAYOUT_NOTES))) + else if (aStyleName == STR_LAYOUT_NOTES) { aStyleName = OUString(SdResId(STR_PSEUDOSHEET_NOTES)); } else { - OUString aOutlineStr((SdResId(STR_LAYOUT_OUTLINE))); + OUString aOutlineStr(STR_LAYOUT_OUTLINE); sal_Int32 nPos = aStyleName.indexOf(aOutlineStr); if (nPos != -1) { @@ -557,7 +558,7 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems) } if (eFamily == SD_STYLE_FAMILY_MASTERPAGE && - aStyleName.indexOf(OUString(SdResId(STR_LAYOUT_OUTLINE))) != -1 && + aStyleName.indexOf(STR_LAYOUT_OUTLINE) != -1 && rSet.GetItemState(EE_CHAR_FONTHEIGHT) == SfxItemState::SET) { const SfxItemSet* pCurSet = &GetItemSet(); diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index ebbb9c1fc1dc..413c85ac866f 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -79,6 +79,7 @@ #include "sdpage.hxx" #include "sdattr.hxx" #include "glob.hrc" +#include "strings.hxx" #include "anminfo.hxx" #include "imapinfo.hxx" #include "sdresid.hxx" @@ -363,7 +364,7 @@ HtmlExport::HtmlExport( maTextColor(COL_BLACK), maBackColor(COL_WHITE), mbDocColors(false), - maHTMLExtension(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION)), + maHTMLExtension(STR_HTMLEXP_DEFAULT_EXTENSION), maIndexUrl("index"), meScript( SCRIPT_ASP ), maHTMLHeader( diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 1b33d23c632e..9526ab2bdf4c 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -51,6 +51,7 @@ #include "htmlpublishmode.hxx" #include "helpids.h" #include "buttonset.hxx" +#include "strings.hxx" using namespace std; using namespace com::sun::star::uno; @@ -425,7 +426,7 @@ SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType) pPage2_ASP->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl)); pPage2_PERL->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl)); - pPage2_Index->SetText("index" + SD_RESSTR(STR_HTMLEXP_DEFAULT_EXTENSION)); + pPage2_Index->SetText("index" STR_HTMLEXP_DEFAULT_EXTENSION); pPage2_CGI->SetText( "/cgi-bin/" ); pPage3_Png->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl)); diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 4e5cb9c7180b..3e1e6c454a1a 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -50,6 +50,7 @@ #include <sfx2/docinf.hxx> #include "glob.hrc" +#include "strings.hxx" #include "pptin.hxx" #include "Outliner.hxx" #include "drawdoc.hxx" @@ -638,7 +639,7 @@ bool ImplSdPPTImport::Import() } pPage->SetName( aLayoutName ); aLayoutName += SD_LT_SEPARATOR; - aLayoutName += SD_RESSTR( STR_LAYOUT_OUTLINE ); + aLayoutName += STR_LAYOUT_OUTLINE; pPage->SetLayoutName( aLayoutName ); // set stylesheets diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 6545f0b80b92..7dd87b46059e 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -254,10 +254,6 @@ String STR_EXPORT_HTML_NAME { Text [ en-US ] = "Web Page"; }; -String STR_HTMLEXP_DEFAULT_EXTENSION -{ - Text = ".html"; -}; String STR_UNDO_COPYOBJECTS { Text [ en-US ] = "Duplicate" ; diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index b81d4708b5c2..b7641aa2ea34 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -243,8 +243,7 @@ TemplateScanner::State TemplateScanner::ScanEntry() // The following id comes from the bugdoc in #i2764#. || (sContentType == "Impress 2.0")) { - OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString( - STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, sTitle ); + OUString sLocalisedTitle = SfxDocumentTemplates::ConvertResourceString(sTitle); mpLastAddedEntry = new TemplateEntry(sLocalisedTitle, sTargetURL); mpTemplateDirectory->InsertEntry(mpLastAddedEntry); } diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 533ec58df7ad..77c39845a4e4 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -39,6 +39,7 @@ #include "sdresid.hxx" #include "glob.hrc" +#include "strings.hxx" #include "bulmaper.hxx" #include "DrawDocShell.hxx" #include <svl/aeitem.hxx> @@ -96,7 +97,7 @@ OutlineBulletDlg::OutlineBulletDlg( if(bOutliner) { SfxStyleSheetBasePool* pSSPool = pView->GetDocSh()->GetStyleSheetPool(); - OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1"); + OUString aStyleName(STR_LAYOUT_OUTLINE " 1"); SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO); if( pFirstStyleSheet ) pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem)); diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 604ddd093209..7b6842539fbe 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -33,7 +33,7 @@ #include "drawdoc.hxx" #include "stlsheet.hxx" #include "glob.hrc" - +#include "strings.hxx" StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, SfxStyleSheet* pTheStyleSheet, @@ -59,23 +59,23 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, if (nPos != -1) aName = aName.copy(nPos + strlen(SD_LT_SEPARATOR)); - if (aName == SD_RESSTR(STR_LAYOUT_TITLE)) + if (aName == STR_LAYOUT_TITLE) { aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE); } - else if (aName == SD_RESSTR(STR_LAYOUT_SUBTITLE)) + else if (aName == STR_LAYOUT_SUBTITLE) { aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE); } - else if (aName == SD_RESSTR(STR_LAYOUT_BACKGROUND)) + else if (aName == STR_LAYOUT_BACKGROUND) { aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND); } - else if (aName == SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS)) + else if (aName == STR_LAYOUT_BACKGROUNDOBJECTS) { aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS); } - else if (aName == SD_RESSTR(STR_LAYOUT_NOTES)) + else if (aName == STR_LAYOUT_NOTES) { aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES); } @@ -86,7 +86,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, if (nPos != -1) { OUString aNumStr(aName.copy(aOutlineStr.getLength())); - aName = SD_RESSTR(STR_LAYOUT_OUTLINE) + aNumStr; + aName = STR_LAYOUT_OUTLINE + aNumStr; } } diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index e5ec8b91c1be..4366d5a5aa57 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -29,6 +29,7 @@ #include "app.hrc" #include "glob.hrc" +#include "strings.hxx" #include "fudraw.hxx" #include "View.hxx" #include "Window.hxx" @@ -316,7 +317,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, ***********************************************/ OUString aName( pPage->GetLayoutName() ); sal_Int32 n = aName.indexOf(SD_LT_SEPARATOR) + strlen(SD_LT_SEPARATOR); - aName = aName.copy(0, n) + SD_RESSTR(STR_LAYOUT_BACKGROUNDOBJECTS); + aName = aName.copy(0, n) + STR_LAYOUT_BACKGROUNDOBJECTS; SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>(pPage->GetModel()-> GetStyleSheetPool()-> Find(aName, SD_STYLE_FAMILY_MASTERPAGE)); diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 81c5f6799b6b..c15d2948573b 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -26,6 +26,7 @@ #include <editeng/numitem.hxx> #include "sdresid.hxx" #include "glob.hrc" +#include "strings.hxx" #include <editeng/editdata.hxx> #include <svx/svxids.hrc> @@ -334,7 +335,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u if(bOutliner) { SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool(); - OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1"); + OUString aStyleName(STR_LAYOUT_OUTLINE " 1"); SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO); if( pFirstStyleSheet ) pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem)); diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 683c7e58cab1..7a87b97976e8 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -29,6 +29,7 @@ #include "strings.hrc" #include "glob.hrc" #include "prltempl.hrc" +#include "strings.hxx" #include "sdresid.hxx" #include "drawdoc.hxx" @@ -121,12 +122,12 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) if( bPage ) { ePO = PO_TITLE; - aStyleName += SD_RESSTR(STR_LAYOUT_TITLE); + aStyleName += STR_LAYOUT_TITLE; } else { ePO = (PresentationObjects) ( PO_OUTLINE_1 + nDepth - 1 ); - aStyleName += SD_RESSTR(STR_LAYOUT_OUTLINE) + " " + aStyleName += STR_LAYOUT_OUTLINE " " + OUString::number(nDepth); } diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index 2582ab3625e2..b7efeb248c64 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -328,8 +328,6 @@ #define STR_AL_TITLE_VERT_OUTLINE (RID_APP_START+674) #define STR_AL_TITLE_VERT_OUTLINE_CLIPART (RID_APP_START+675) -#define STR_HTMLEXP_DEFAULT_EXTENSION (RID_APP_START+680) - #define STR_SET_BACKGROUND_PICTURE (RID_APP_START+681) #define STR_DESC_RENAMESLIDE (RID_APP_START+682) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 0bd7d4532a6c..aefeb457483a 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -87,6 +87,7 @@ #include <sdpage.hxx> #include <strings.hrc> +#include <strings.hxx> #include <unolayer.hxx> #include <unoprnms.hxx> #include <unopage.hxx> @@ -3135,7 +3136,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn OUString aLayoutName( aPrefix ); aLayoutName += SD_LT_SEPARATOR; - aLayoutName += SD_RESSTR(STR_LAYOUT_OUTLINE); + aLayoutName += STR_LAYOUT_OUTLINE; // create styles static_cast<SdStyleSheetPool*>(pDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix ); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 11ec2247db07..18c50b8c608d 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -69,6 +69,7 @@ #include "DrawViewShell.hxx" #include "unoobj.hxx" #include "res_bmp.hrc" +#include "strings.hxx" #include "bitmaps.hlst" #include "unokywds.hxx" #include "unopback.hxx" @@ -2907,7 +2908,7 @@ void SdMasterPage::setBackground( const Any& rValue ) { OUString aLayoutName( static_cast< SdPage* >( SvxFmDrawPage::mpPage )->GetLayoutName() ); aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)+4); - aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND); + aLayoutName += STR_LAYOUT_BACKGROUND; SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE ); if( pStyleSheet ) @@ -2951,7 +2952,7 @@ void SdMasterPage::getBackground( Any& rValue ) { OUString aLayoutName( static_cast< SdPage* >(SvxFmDrawPage::mpPage)->GetLayoutName() ); aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)+4); - aLayoutName += SD_RESSTR(STR_LAYOUT_BACKGROUND); + aLayoutName += STR_LAYOUT_BACKGROUND; SfxStyleSheetBase* pStyleSheet = pSSPool->Find( aLayoutName, SD_STYLE_FAMILY_MASTERPAGE ); if( pStyleSheet ) diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index 1fd58ecdc028..380ffc4aad03 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -29,6 +29,7 @@ #include "sdxfer.hxx" #include "sdresid.hxx" #include "glob.hrc" +#include "strings.hxx" #include <svx/svdpagv.hxx> #include <osl/mutex.hxx> @@ -141,7 +142,7 @@ void ViewClipboard::AssignMasterPage ( // We have to remove the layout suffix from the layout name which is // appended again by SetMasterPage() to the given name. Don't ask. - OUString sLayoutSuffix = SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE); + OUString sLayoutSuffix = SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; sal_Int32 nLength = sLayoutSuffix.getLength(); OUString sLayoutName = pMasterPage->GetLayoutName(); if (sLayoutName.endsWith(sLayoutSuffix)) diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index ac3176c2887f..afbb9c07e917 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -24,6 +24,7 @@ #include <svx/svdview.hxx> #include "strings.hrc" +#include "strings.hxx" #include "glob.hxx" #include "glob.hrc" #include "app.hrc" @@ -179,13 +180,13 @@ RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction( void RenameLayoutTemplateUndoAction::Undo() { - OUString aLayoutName(maNewName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE)); + OUString aLayoutName(maNewName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE); mpDoc->RenameLayoutTemplate( aLayoutName, maOldName ); } void RenameLayoutTemplateUndoAction::Redo() { - OUString aLayoutName(maOldName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE)); + OUString aLayoutName(maOldName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE); mpDoc->RenameLayoutTemplate( aLayoutName, maNewName ); } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 2c7f16a1338d..25917474f54c 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -89,6 +89,7 @@ #include <editeng/editeng.hxx> #include <svl/poolitem.hxx> #include <glob.hrc> +#include "strings.hxx" #include "AccessibleDocumentViewBase.hxx" using namespace ::com::sun::star; @@ -908,7 +909,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& if(bOutliner) { SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool(); - OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1"); + OUString aStyleName(STR_LAYOUT_OUTLINE " 1"); SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO); if( pFirstStyleSheet ) pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, false, reinterpret_cast<const SfxPoolItem**>(&pItem)); |