summaryrefslogtreecommitdiff
path: root/sw/source/uibase/docvw
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/docvw')
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.cxx6
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationWin2.cxx8
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx26
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx8
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx10
7 files changed, 31 insertions, 31 deletions
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index f0cf0645608c..1969ce7f9128 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -49,8 +49,8 @@ AnnotationMenuButton::AnnotationMenuButton(sw::annotation::SwAnnotationWin& rSid
{
AddEventListener(LINK(&mrSidebarWin, sw::annotation::SwAnnotationWin, WindowEventListener));
- SetAccessibleName(SW_RES(STR_ACCESS_ANNOTATION_BUTTON_NAME));
- SetAccessibleDescription(SW_RES(STR_ACCESS_ANNOTATION_BUTTON_DESC));
+ SetAccessibleName(SwResId(STR_ACCESS_ANNOTATION_BUTTON_NAME));
+ SetAccessibleDescription(SwResId(STR_ACCESS_ANNOTATION_BUTTON_DESC));
SetQuickHelpText(GetAccessibleDescription());
}
@@ -111,7 +111,7 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt )
{
if ((sAuthor = aUserOpt.GetID()).isEmpty())
{
- sAuthor = SW_RES(STR_REDLINE_UNKNOWN_AUTHOR);
+ sAuthor = SwResId(STR_REDLINE_UNKNOWN_AUTHOR);
}
}
// do not allow to reply to ourself and no answer possible if this note is in a protected section
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 8bbb502c5ce6..a55764f4434d 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -368,7 +368,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
const LocaleDataWrapper& rLocalData = aSysLocale.GetLocaleData();
SwRewriter aRewriter;
aRewriter.AddRule(UndoArg1, pWin->GetAuthor());
- const OUString aText = aRewriter.Apply(SW_RESSTR(STR_REPLY))
+ const OUString aText = aRewriter.Apply(SwResId(STR_REPLY))
+ " (" + rLocalData.getDate( pWin->GetDate())
+ ", " + rLocalData.getTime( pWin->GetTime(), false)
+ "): \"";
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index c61b7a82f45d..e4360ab085ea 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -448,7 +448,7 @@ void SwAnnotationWin::InitControls()
// window controls for author and date
mpMetadataAuthor = VclPtr<Edit>::Create( this, 0 );
- mpMetadataAuthor->SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_AUTHOR_NAME ) );
+ mpMetadataAuthor->SetAccessibleName( SwResId( STR_ACCESS_ANNOTATION_AUTHOR_NAME ) );
mpMetadataAuthor->EnableRTL(AllSettings::GetLayoutRTL());
mpMetadataAuthor->SetReadOnly();
mpMetadataAuthor->AlwaysDisableInput(true);
@@ -467,7 +467,7 @@ void SwAnnotationWin::InitControls()
}
mpMetadataDate = VclPtr<Edit>::Create( this, 0 );
- mpMetadataDate->SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_DATE_NAME ) );
+ mpMetadataDate->SetAccessibleName( SwResId( STR_ACCESS_ANNOTATION_DATE_NAME ) );
mpMetadataDate->EnableRTL(AllSettings::GetLayoutRTL());
mpMetadataDate->SetReadOnly();
mpMetadataDate->AlwaysDisableInput(true);
@@ -554,7 +554,7 @@ void SwAnnotationWin::CheckMetaText()
OUString sMeta = GetAuthor();
if (sMeta.isEmpty())
{
- sMeta = SW_RESSTR(STR_NOAUTHOR);
+ sMeta = SwResId(STR_NOAUTHOR);
}
else if (sMeta.getLength() > 23)
{
@@ -572,7 +572,7 @@ void SwAnnotationWin::CheckMetaText()
}
else
{
- sMeta = SW_RESSTR(STR_NODATE);
+ sMeta = SwResId(STR_NODATE);
}
if (GetTime()!=0)
{
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index e83b876c2a5a..f0097c6f2931 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -147,13 +147,13 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwFrame *pFrame
// Rewrite the menu entries' text
if (m_bIsHeader)
{
- m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), SW_RESSTR(STR_FORMAT_HEADER));
- m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), SW_RESSTR(STR_DELETE_HEADER));
+ m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), SwResId(STR_FORMAT_HEADER));
+ m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), SwResId(STR_DELETE_HEADER));
}
else
{
- m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), SW_RESSTR(STR_FORMAT_FOOTER));
- m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), SW_RESSTR(STR_DELETE_FOOTER));
+ m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), SwResId(STR_FORMAT_FOOTER));
+ m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), SwResId(STR_DELETE_FOOTER));
}
SetPopupMenu(m_pPopupMenu);
@@ -182,17 +182,17 @@ void SwHeaderFooterWin::SetOffset(Point aOffset, long nXLineStart, long nXLineEn
bool bIsFirst = !pDesc->IsFirstShared() && GetPageFrame()->OnFirstPage();
bool bIsLeft = !pDesc->IsHeaderShared() && !GetPageFrame()->OnRightPage();
bool bIsRight = !pDesc->IsHeaderShared() && GetPageFrame()->OnRightPage();
- m_sLabel = SW_RESSTR(STR_HEADER_TITLE);
+ m_sLabel = SwResId(STR_HEADER_TITLE);
if (!m_bIsHeader)
- m_sLabel = bIsFirst ? SW_RESSTR(STR_FIRST_FOOTER_TITLE)
- : bIsLeft ? SW_RESSTR(STR_LEFT_FOOTER_TITLE)
- : bIsRight ? SW_RESSTR(STR_RIGHT_FOOTER_TITLE)
- : SW_RESSTR(STR_FOOTER_TITLE );
+ m_sLabel = bIsFirst ? SwResId(STR_FIRST_FOOTER_TITLE)
+ : bIsLeft ? SwResId(STR_LEFT_FOOTER_TITLE)
+ : bIsRight ? SwResId(STR_RIGHT_FOOTER_TITLE)
+ : SwResId(STR_FOOTER_TITLE );
else
- m_sLabel = bIsFirst ? SW_RESSTR(STR_FIRST_HEADER_TITLE)
- : bIsLeft ? SW_RESSTR(STR_LEFT_HEADER_TITLE)
- : bIsRight ? SW_RESSTR(STR_RIGHT_HEADER_TITLE)
- : SW_RESSTR(STR_HEADER_TITLE);
+ m_sLabel = bIsFirst ? SwResId(STR_FIRST_HEADER_TITLE)
+ : bIsLeft ? SwResId(STR_LEFT_HEADER_TITLE)
+ : bIsRight ? SwResId(STR_RIGHT_HEADER_TITLE)
+ : SwResId(STR_HEADER_TITLE);
sal_Int32 nPos = m_sLabel.lastIndexOf("%1");
m_sLabel = m_sLabel.replaceAt(nPos, 2, pDesc->GetName());
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 2651538f6f82..55b4ea914d4a 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1491,7 +1491,7 @@ void SwPostItMgr::Delete(const OUString& rAuthor)
SetActiveSidebarWin(nullptr);
}
SwRewriter aRewriter;
- aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_DELETE_AUTHOR_NOTES) + rAuthor);
+ aRewriter.AddRule(UndoArg1, SwResId(STR_DELETE_AUTHOR_NOTES) + rAuthor);
mpWrtShell->StartUndo( SwUndoId::DELETE, &aRewriter );
IsPostitFieldWithAuthorOf aFilter(rAuthor);
@@ -1518,7 +1518,7 @@ void SwPostItMgr::Delete(sal_uInt32 nPostItId)
SetActiveSidebarWin(nullptr);
}
SwRewriter aRewriter;
- aRewriter.AddRule(UndoArg1, SW_RESSTR(STR_CONTENT_TYPE_SINGLE_POSTIT));
+ aRewriter.AddRule(UndoArg1, SwResId(STR_CONTENT_TYPE_SINGLE_POSTIT));
mpWrtShell->StartUndo( SwUndoId::DELETE, &aRewriter );
IsPostitFieldWithPostitId aFilter(nPostItId);
@@ -1539,7 +1539,7 @@ void SwPostItMgr::Delete()
mpWrtShell->StartAllAction();
SetActiveSidebarWin(nullptr);
SwRewriter aRewriter;
- aRewriter.AddRule(UndoArg1, SW_RES(STR_DELETE_ALL_NOTES) );
+ aRewriter.AddRule(UndoArg1, SwResId(STR_DELETE_ALL_NOTES) );
mpWrtShell->StartUndo( SwUndoId::DELETE, &aRewriter );
IsPostitField aFilter;
@@ -1598,7 +1598,7 @@ void SwPostItMgr::FormatAll(const SfxItemSet &rNewAttr)
{
mpWrtShell->StartAllAction();
SwRewriter aRewriter;
- aRewriter.AddRule(UndoArg1, SW_RES(STR_FORMAT_ALL_NOTES) );
+ aRewriter.AddRule(UndoArg1, SwResId(STR_FORMAT_ALL_NOTES) );
mpWrtShell->StartUndo( SwUndoId::INSATTR, &aRewriter );
for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i)
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 0d4cf9f0a41b..c38b243a5880 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -123,7 +123,7 @@ void SidebarTextControl::RequestHelp(const HelpEvent &rEvt)
if ( nResId &&
mrDocView.GetWrtShell().GetContentAtPos( mrSidebarWin.GetAnchorPos(), aContentAtPos ) )
{
- OUString sText = SW_RESSTR( nResId ) + ": " +
+ OUString sText = SwResId( nResId ) + ": " +
aContentAtPos.aFnd.pRedl->GetAuthorString() + " - " +
GetAppLangDateTimeString( aContentAtPos.aFnd.pRedl->GetTimeStamp() );
Help::ShowQuickHelp( this,PixelToLogic(tools::Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sText);
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 21b5d2484011..1a5e1dd0243b 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -80,7 +80,7 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon )
OUStringBuffer sBuf;
if( nResId )
{
- sBuf.append(SW_RESSTR(nResId));
+ sBuf.append(SwResId(nResId));
sBuf.append(": ");
sBuf.append(rRedl.GetAuthorString());
sBuf.append(" - ");
@@ -237,7 +237,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
OUString aModStr( aModifiedCode.GetName() );
aModStr = aModStr.replaceFirst(aCode.GetName(), "");
aModStr = aModStr.replaceAll("+", "");
- sText = SW_RESSTR(STR_SMARTTAG_CLICK).replaceAll("%s", aModStr);
+ sText = SwResId(STR_SMARTTAG_CLICK).replaceAll("%s", aModStr);
}
break;
@@ -247,7 +247,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
const SwFormatFootnote* pFootnote = static_cast<const SwFormatFootnote*>(aContentAtPos.aFnd.pAttr);
OUString sTmp;
pFootnote->GetFootnoteText( sTmp );
- sText = SW_RESSTR( pFootnote->IsEndNote()
+ sText = SwResId( pFootnote->IsEndNote()
? STR_ENDNOTE : STR_FTNNOTE ) + sTmp;
bBalloon = true;
if( aContentAtPos.IsInRTLText() )
@@ -275,7 +275,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
case IsAttrAtPos::RefMark:
if(aContentAtPos.aFnd.pAttr)
{
- sText = SW_RESSTR(STR_CONTENT_TYPE_SINGLE_REFERENCE);
+ sText = SwResId(STR_CONTENT_TYPE_SINGLE_REFERENCE);
sText += ": ";
sText += static_cast<const SwFormatRefMark*>(aContentAtPos.aFnd.pAttr)->GetRefName();
}
@@ -418,7 +418,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
}
if(nTabRes)
{
- sText = SW_RESSTR(nTabRes);
+ sText = SwResId(nTabRes);
Size aTextSize( GetTextWidth(sText), GetTextHeight());
tools::Rectangle aRect(rEvt.GetMousePosPixel(), aTextSize);
OUString sDisplayText(ClipLongToolTip(sText));
generated by cgit (git 2.34.1) at 2024-07-24 22:28:04 +0000