sw/inc/poolfmt.hxx | 6 +++---
sw/inc/strings.hrc | 6 +++---
sw/source/core/doc/DocumentStylePoolManager.cxx | 12 ++++++------
sw/source/core/doc/poolfmt.cxx | 4 ++--
sw/source/core/layout/pagedesc.cxx | 2 +-
sw/source/core/unocore/unostyle.cxx | 2 +-
sw/source/filter/html/css1atr.cxx | 4 ++--
sw/source/filter/html/htmlcss1.cxx | 2 +-
sw/source/filter/html/swhtml.cxx | 2 +-
sw/source/filter/ww8/writerwordglue.cxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 4 ++--
sw/source/ui/envelp/envfmt.cxx | 2 +-
sw/source/ui/envelp/envlop1.cxx | 4 ++--
sw/source/uibase/app/appenv.cxx | 22 +++++++++++-----------
sw/source/uibase/app/docstyle.cxx | 4 ++--
15 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit e302e37733225e38dd4dcdb3cd90ae89eaee2cd8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 28 09:28:13 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 28 12:33:21 2020 +0200
'Jaket' -> Envelope
Change-Id: Idcf95141ca4169fa0c1580c99a7e51a3df77f640
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103535
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 799134fd5017..31cb1dfa2c49 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -171,7 +171,7 @@ RES_POOLPAGE_STANDARD = RES_POOLPAGE_BEGIN, ///<
Standard page.
RES_POOLPAGE_FIRST, ///< First page.
RES_POOLPAGE_LEFT, ///< Left page.
RES_POOLPAGE_RIGHT, ///< Right page.
-RES_POOLPAGE_JAKET, ///< Envelope.
+RES_POOLPAGE_ENVELOPE, ///< Envelope.
RES_POOLPAGE_REGISTER, ///< Index.
RES_POOLPAGE_HTML, ///< HTML.
RES_POOLPAGE_FOOTNOTE, ///< Footnote at end of
document.
@@ -350,8 +350,8 @@ RES_POOLCOLL_LABEL_FIGURE,
///< Label figure
/// Other stuff.
RES_POOLCOLL_FRAME, ///< Frames.
RES_POOLCOLL_FOOTNOTE, ///< Footnotes.
-RES_POOLCOLL_JAKETADRESS, ///< Addressee.
-RES_POOLCOLL_SENDADRESS, ///< Sender.
+RES_POOLCOLL_ENVELOPE_ADDRESS, ///< Addressee.
+RES_POOLCOLL_SEND_ADDRESS, ///< Sender.
RES_POOLCOLL_ENDNOTE, ///< Endnotes.
RES_POOLCOLL_LABEL_DRAWING, ///< Label drawing
objects.
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index a9b2ab36d587..6de125ea43e0 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -141,8 +141,8 @@
#define STR_POOLCOLL_LABEL_FRAME
NC_("STR_POOLCOLL_LABEL_FRAME", "Text")
#define STR_POOLCOLL_LABEL_DRAWING
NC_("STR_POOLCOLL_LABEL_DRAWING", "Drawing")
#define STR_POOLCOLL_LABEL_FIGURE
NC_("STR_POOLCOLL_LABEL_FIGURE", "Figure")
-#define STR_POOLCOLL_JAKETADRESS
NC_("STR_POOLCOLL_JAKETADRESS", "Addressee")
-#define STR_POOLCOLL_SENDADRESS NC_("STR_POOLCOLL_SENDADRESS",
"Sender")
+#define STR_POOLCOLL_ENVELOPE_ADDRESS
NC_("STR_POOLCOLL_ENVELOPE_ADDRESS", "Addressee")
+#define STR_POOLCOLL_SEND_ADDRESS
NC_("STR_POOLCOLL_SEND_ADDRESS", "Sender")
#define STR_POOLCOLL_TOX_IDXH NC_("STR_POOLCOLL_TOX_IDXH",
"Index Heading")
#define STR_POOLCOLL_TOX_IDX1 NC_("STR_POOLCOLL_TOX_IDX1",
"Index 1")
#define STR_POOLCOLL_TOX_IDX2 NC_("STR_POOLCOLL_TOX_IDX2",
"Index 2")
@@ -193,7 +193,7 @@
#define STR_POOLPAGE_FIRST NC_("STR_POOLPAGE_FIRST",
"First Page")
#define STR_POOLPAGE_LEFT NC_("STR_POOLPAGE_LEFT", "Left
Page")
#define STR_POOLPAGE_RIGHT NC_("STR_POOLPAGE_RIGHT",
"Right Page")
-#define STR_POOLPAGE_JAKET NC_("STR_POOLPAGE_JAKET",
"Envelope")
+#define STR_POOLPAGE_ENVELOPE NC_("STR_POOLPAGE_ENVELOPE",
"Envelope")
#define STR_POOLPAGE_REGISTER NC_("STR_POOLPAGE_REGISTER",
"Index")
#define STR_POOLPAGE_HTML NC_("STR_POOLPAGE_HTML",
"HTML")
#define STR_POOLPAGE_FOOTNOTE NC_("STR_POOLPAGE_FOOTNOTE",
"Footnote")
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index de8303491c6c..f93e02151758 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -379,8 +379,8 @@ static const char* STR_POOLCOLL_EXTRA_ARY[]
// Miscellaneous
STR_POOLCOLL_FRAME,
STR_POOLCOLL_FOOTNOTE,
- STR_POOLCOLL_JAKETADRESS,
- STR_POOLCOLL_SENDADRESS,
+ STR_POOLCOLL_ENVELOPE_ADDRESS,
+ STR_POOLCOLL_SEND_ADDRESS,
STR_POOLCOLL_ENDNOTE,
STR_POOLCOLL_LABEL_DRAWING
};
@@ -505,7 +505,7 @@ static const char* STR_POOLPAGE_ARY[] =
STR_POOLPAGE_FIRST,
STR_POOLPAGE_LEFT,
STR_POOLPAGE_RIGHT,
- STR_POOLPAGE_JAKET,
+ STR_POOLPAGE_ENVELOPE,
STR_POOLPAGE_REGISTER,
STR_POOLPAGE_HTML,
STR_POOLPAGE_FOOTNOTE,
@@ -969,7 +969,7 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
case RES_POOLCOLL_LABEL_FIGURE:
break;
- case RES_POOLCOLL_JAKETADRESS: // envelope address
+ case RES_POOLCOLL_ENVELOPE_ADDRESS: // envelope address
{
SvxULSpaceItem aUL( RES_UL_SPACE );
aUL.SetLower( PT_3 );
@@ -980,7 +980,7 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
}
break;
- case RES_POOLCOLL_SENDADRESS: // Sender address
+ case RES_POOLCOLL_SEND_ADDRESS: // Sender address
{
if(
m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) )
SetAllScriptItem( aSet, SvxPostureItem(ITALIC_NORMAL,
RES_CHRATR_POSTURE) );
@@ -1804,7 +1804,7 @@ SwPageDesc*
DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
}
break;
- case RES_POOLPAGE_JAKET: // "Envelope"
+ case RES_POOLPAGE_ENVELOPE: // "Envelope"
{
Size aPSize( SvxPaperInfo::GetPaperSize( PAPER_ENV_C65 ) );
LandscapeSwap( aPSize );
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 326e05eaf892..b3ae8b2b29f8 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -213,8 +213,8 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
case RES_POOLCOLL_TABLE:
case RES_POOLCOLL_FOOTNOTE:
case RES_POOLCOLL_ENDNOTE:
- case RES_POOLCOLL_JAKETADRESS:
- case RES_POOLCOLL_SENDADRESS:
+ case RES_POOLCOLL_ENVELOPE_ADDRESS:
+ case RES_POOLCOLL_SEND_ADDRESS:
case RES_POOLCOLL_HEADERFOOTER:
case RES_POOLCOLL_LABEL:
nRet = RES_POOLCOLL_STANDARD; break;
diff --git a/sw/source/core/layout/pagedesc.cxx
b/sw/source/core/layout/pagedesc.cxx
index c9c242435250..5fe089282a84 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -393,7 +393,7 @@ static const char* STR_POOLPAGE[] =
STR_POOLPAGE_FIRST,
STR_POOLPAGE_LEFT,
STR_POOLPAGE_RIGHT,
- STR_POOLPAGE_JAKET,
+ STR_POOLPAGE_ENVELOPE,
STR_POOLPAGE_REGISTER,
STR_POOLPAGE_HTML,
STR_POOLPAGE_FOOTNOTE,
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index e5ce047fa6e1..2f07bd534f66 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1556,7 +1556,7 @@ public:
STR_POOLPAGE_FIRST,
STR_POOLPAGE_LEFT,
STR_POOLPAGE_RIGHT,
- STR_POOLPAGE_JAKET,
+ STR_POOLPAGE_ENVELOPE,
STR_POOLPAGE_REGISTER,
STR_POOLPAGE_HTML,
STR_POOLPAGE_FOOTNOTE,
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 0110b8c6bc4f..9b3b40202ffb 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -794,7 +794,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFormat
*pFormat, OString& rTok
case RES_POOLCOLL_HEADLINE6:
rToken = OString(OOO_STRING_SVTOOLS_HTML_head6);
break;
- case RES_POOLCOLL_SENDADRESS:
+ case RES_POOLCOLL_SEND_ADDRESS:
rToken = OString(OOO_STRING_SVTOOLS_HTML_address);
break;
case RES_POOLCOLL_HTML_BLOCKQUOTE:
@@ -1593,7 +1593,7 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const
SwFormat& rFormat,
case RES_POOLCOLL_HEADLINE6:
rHTMLWrt.m_nDfltTopMargin = HTML_HEADSPACE;
break;
- case RES_POOLCOLL_SENDADRESS:
+ case RES_POOLCOLL_SEND_ADDRESS:
case RES_POOLCOLL_HTML_DT:
case RES_POOLCOLL_HTML_DD:
case RES_POOLCOLL_HTML_PRE:
diff --git a/sw/source/filter/html/htmlcss1.cxx
b/sw/source/filter/html/htmlcss1.cxx
index ca3ba0b1a87f..69eccc08fd33 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -902,7 +902,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector
*pSelector,
}
break;
case HtmlTokenId::ADDRESS_ON:
- nPoolCollId = RES_POOLCOLL_SENDADRESS;
+ nPoolCollId = RES_POOLCOLL_SEND_ADDRESS;
break;
case HtmlTokenId::BLOCKQUOTE_ON:
nPoolCollId = RES_POOLCOLL_HTML_BLOCKQUOTE;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 00aea5871b1c..d7bbb52ac908 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1680,7 +1680,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
case HtmlTokenId::ADDRESS_ON:
if( m_nOpenParaToken != HtmlTokenId::NONE )
EndPara();
- NewTextFormatColl( HtmlTokenId::ADDRESS_ON, RES_POOLCOLL_SENDADRESS );
+ NewTextFormatColl(HtmlTokenId::ADDRESS_ON, RES_POOLCOLL_SEND_ADDRESS);
break;
case HtmlTokenId::ADDRESS_OFF:
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 7c34c416208c..b6a22c593969 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -143,7 +143,7 @@ namespace myImplHelpers
RES_POOLCOLL_TOX_CNTNT8, RES_POOLCOLL_TOX_CNTNT9, RES_NONE,
RES_POOLCOLL_FOOTNOTE, RES_NONE, RES_POOLCOLL_HEADER,
RES_POOLCOLL_FOOTER, RES_POOLCOLL_TOX_IDXH, RES_NONE, RES_NONE,
- RES_POOLCOLL_JAKETADRESS, RES_POOLCOLL_SENDADRESS, RES_NONE,
+ RES_POOLCOLL_ENVELOPE_ADDRESS, RES_POOLCOLL_SEND_ADDRESS, RES_NONE,
RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_ENDNOTE,
RES_NONE, RES_NONE, RES_NONE, RES_POOLCOLL_LISTS_BEGIN,
RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE, RES_NONE,
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index 5f4c31d9bc99..f3f8e3db3912 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -235,8 +235,8 @@ sal_uInt16 MSWordStyles::GetWWId( const SwFormat& rFormat )
case RES_POOLCOLL_TOX_IDXH: nRet = 33; break;
case RES_POOLCOLL_LABEL: nRet = 34; break;
case RES_POOLCOLL_LABEL_DRAWING: nRet = 35; break;
- case RES_POOLCOLL_JAKETADRESS: nRet = 36; break;
- case RES_POOLCOLL_SENDADRESS: nRet = 37; break;
+ case RES_POOLCOLL_ENVELOPE_ADDRESS: nRet = 36; break;
+ case RES_POOLCOLL_SEND_ADDRESS: nRet = 37; break;
case RES_POOLCOLL_ENDNOTE: nRet = 43; break;
case RES_POOLCOLL_TOX_AUTHORITIESH: nRet = 44; break;
case RES_POOLCOLL_TOX_CNTNTH: nRet = 46; break;
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 9420a3b5f78a..38945a3a8cbc 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -233,7 +233,7 @@ void SwEnvFormatPage::Edit(const OString& rIdent, bool
bSender)
OSL_ENSURE(pSh, "Shell missing");
SwTextFormatColl* pColl = pSh->GetTextCollFromPool( static_cast<
sal_uInt16 >(
- bSender ? RES_POOLCOLL_SENDADRESS : RES_POOLCOLL_JAKETADRESS));
+ bSender ? RES_POOLCOLL_SEND_ADDRESS : RES_POOLCOLL_ENVELOPE_ADDRESS));
OSL_ENSURE(pColl, "Text collection missing");
if (rIdent.startsWith("character"))
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 2cf92a3a51b3..0f2e69f8e862 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -164,12 +164,12 @@ short SwEnvDlg::Ok()
{
if (pAddresseeSet)
{
- SwTextFormatColl* pColl =
pSh->GetTextCollFromPool(RES_POOLCOLL_JAKETADRESS);
+ SwTextFormatColl* pColl =
pSh->GetTextCollFromPool(RES_POOLCOLL_ENVELOPE_ADDRESS);
pColl->SetFormatAttr(*pAddresseeSet);
}
if (pSenderSet)
{
- SwTextFormatColl* pColl =
pSh->GetTextCollFromPool(RES_POOLCOLL_SENDADRESS);
+ SwTextFormatColl* pColl =
pSh->GetTextCollFromPool(RES_POOLCOLL_SEND_ADDRESS);
pColl->SetFormatAttr(*pSenderSet);
}
}
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index b1304a882b87..784720d8f353 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -156,8 +156,8 @@ void SwModule::InsertEnv( SfxRequest& rReq )
// a new document
if ( pOldSh )
{
- ::lcl_CopyCollAttr(pOldSh, pSh, RES_POOLCOLL_JAKETADRESS);
- ::lcl_CopyCollAttr(pOldSh, pSh, RES_POOLCOLL_SENDADRESS);
+ ::lcl_CopyCollAttr(pOldSh, pSh, RES_POOLCOLL_ENVELOPE_ADDRESS);
+ ::lcl_CopyCollAttr(pOldSh, pSh, RES_POOLCOLL_SEND_ADDRESS);
}
// Read SwEnvItem from config
@@ -173,9 +173,9 @@ void SwModule::InsertEnv( SfxRequest& rReq )
if(pOldSh )
{
const SwPageDesc& rCurPageDesc =
pOldSh->GetPageDesc(pOldSh->GetCurPageDesc());
- OUString sJacket;
- SwStyleNameMapper::FillUIName( RES_POOLPAGE_JAKET, sJacket );
- bEnvChange = rCurPageDesc.GetName() == sJacket;
+ OUString sEnvelope;
+ SwStyleNameMapper::FillUIName( RES_POOLPAGE_ENVELOPE, sEnvelope );
+ bEnvChange = rCurPageDesc.GetName() == sEnvelope;
IDocumentDeviceAccess& rIDDA_old = pOldSh->getIDocumentDeviceAccess();
if( rIDDA_old.getPrinter( false ) )
@@ -224,13 +224,13 @@ void SwModule::InsertEnv( SfxRequest& rReq )
OSL_ENSURE(pOldSh, "No document - wasn't 'Insert' disabled???");
SvxPaperBinItem aItem( RES_PAPER_BIN );
aItem.SetValue(static_cast<sal_uInt8>(pSh->getIDocumentDeviceAccess().getPrinter(true)->GetPaperBin()));
-
pOldSh->GetPageDescFromPool(RES_POOLPAGE_JAKET)->GetMaster().SetFormatAttr(aItem);
+
pOldSh->GetPageDescFromPool(RES_POOLPAGE_ENVELOPE)->GetMaster().SetFormatAttr(aItem);
}
SwWrtShell *pTmp = nMode == ENV_INSERT ? pOldSh : pSh;
const SwPageDesc* pFollow = nullptr;
- SwTextFormatColl *pSend = pTmp->GetTextCollFromPool(
RES_POOLCOLL_SENDADRESS ),
- *pAddr = pTmp->GetTextCollFromPool(
RES_POOLCOLL_JAKETADRESS);
+ SwTextFormatColl *pSend =
pTmp->GetTextCollFromPool(RES_POOLCOLL_SEND_ADDRESS),
+ *pAddr =
pTmp->GetTextCollFromPool(RES_POOLCOLL_ENVELOPE_ADDRESS);
const OUString sSendMark = pSend->GetName();
const OUString sAddrMark = pAddr->GetName();
@@ -303,8 +303,8 @@ void SwModule::InsertEnv( SfxRequest& rReq )
// a new document
if ( pOldSh )
{
- ::lcl_CopyCollAttr(pOldSh, pSh, RES_POOLCOLL_JAKETADRESS);
- ::lcl_CopyCollAttr(pOldSh, pSh, RES_POOLCOLL_SENDADRESS);
+ ::lcl_CopyCollAttr(pOldSh, pSh, RES_POOLCOLL_ENVELOPE_ADDRESS);
+ ::lcl_CopyCollAttr(pOldSh, pSh, RES_POOLCOLL_SEND_ADDRESS);
}
}
@@ -317,7 +317,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
pSh->GetPageObjs( aFlyArr );
// Get page description
- SwPageDesc* pDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_JAKET);
+ SwPageDesc* pDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_ENVELOPE);
SwFrameFormat& rFormat = pDesc->GetMaster();
Printer *pPrt = pSh->getIDocumentDeviceAccess().getPrinter( true );
diff --git a/sw/source/uibase/app/docstyle.cxx
b/sw/source/uibase/app/docstyle.cxx
index a7aec918e91d..9dc426bc1d51 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -2839,7 +2839,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
bool bContinue = true;
switch( nId )
{
- case RES_POOLCOLL_SENDADRESS: // --> ADDRESS
+ case RES_POOLCOLL_SEND_ADDRESS: // --> ADDRESS
case RES_POOLCOLL_TABLE_HDLN: // --> TH
case RES_POOLCOLL_TABLE: // --> TD
case RES_POOLCOLL_TEXT: // --> P
@@ -2908,7 +2908,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
{
// then also the ones, that we are mapping:
static sal_uInt16 aPoolIds[] = {
- RES_POOLCOLL_SENDADRESS, // --> ADDRESS
+ RES_POOLCOLL_SEND_ADDRESS, // --> ADDRESS
RES_POOLCOLL_TABLE_HDLN, // --> TH
RES_POOLCOLL_TABLE, // --> TD
RES_POOLCOLL_STANDARD, // --> P
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
