[Libreoffice-commits] core.git: 3 commits - svx/source sw/inc sw/source
Caolán McNamara
caolanm at redhat.com
Mon Sep 28 12:05:50 PDT 2015
svx/source/svdraw/svdmodel.cxx | 1
sw/inc/globals.hrc | 44 +++++
sw/source/core/text/frmform.cxx | 2
sw/source/uibase/utlui/content.cxx | 50 +++---
sw/source/uibase/utlui/glbltree.cxx | 30 +--
sw/source/uibase/utlui/navipi.cxx | 13 -
sw/source/uibase/utlui/navipi.hrc | 43 -----
sw/source/uibase/utlui/navipi.src | 273 ++++++++++++++++++------------------
8 files changed, 229 insertions(+), 227 deletions(-)
New commits:
commit fac7d76d447fd38a690144c6a0d1a427b2273215
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 28 17:21:44 2015 +0100
duplicate comments
Change-Id: I52d51ced4f6792b4b34672da0f3529449cd022b0
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index f85215d..b9a0377 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1899,8 +1899,6 @@ bool SwTextFrm::FormatQuick( bool bForceQuickFormat )
do
{
sal_Int32 nNewStart = aLine.FormatLine(nStart);
- // Check for special case: line is invisible,
- // like in too thin table cell: tdf#66141
bool bThisLayoutIsZeroWidth = (nNewStart == nStart);
nStart = nNewStart;
bool bWillEndlessInsert = (bPreviousLayoutWasZeroWidth && bThisLayoutIsZeroWidth);
commit f902ddfafe279ba5c3ee2192e24d1d7aa2817a0e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 28 17:07:42 2015 +0100
valgrind: pChainingOutliner leaks
Change-Id: I090ae35b79f410a966e2433b2bc5431821554aad
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 942d623..a498df1 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -286,6 +286,7 @@ SdrModel::~SdrModel()
// Delete DrawOutliner only after deleting ItemPool, because ItemPool
// references Items of the DrawOutliner!
+ delete pChainingOutliner;
delete pHitTestOutliner;
delete pDrawOutliner;
commit 63aa32b726e482c49b2aaae9cad8a7beae3653a4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 28 17:05:40 2015 +0100
move strings out of widget
Change-Id: Ie7818eba636dee7830abba8cbbc4becb95fa8310
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index ca0a2ef..d89291e 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -88,6 +88,49 @@
#define STR_ERROR_CLPBRD_READ (RC_GLOBALS_BEGIN + 50)
#define STR_ERROR_PASSWD (RC_GLOBALS_BEGIN + 51)
+// Strings for the context menu of the content tree
+#define STR_CONTEXT_FIRST (RC_GLOBALS_BEGIN + 52)
+#define STR_OUTLINE_LEVEL (STR_CONTEXT_FIRST + 0)
+#define STR_DRAGMODE (STR_CONTEXT_FIRST + 1)
+#define STR_HYPERLINK (STR_CONTEXT_FIRST + 2)
+#define STR_LINK_REGION (STR_CONTEXT_FIRST + 3)
+#define STR_COPY_REGION (STR_CONTEXT_FIRST + 4)
+#define STR_DISPLAY (STR_CONTEXT_FIRST + 5)
+#define STR_ACTIVE_VIEW (STR_CONTEXT_FIRST + 6)
+#define STR_STATUS_FIRST (RC_GLOBALS_BEGIN + 59)
+#define STR_HIDDEN (STR_STATUS_FIRST + 0)
+#define STR_ACTIVE (STR_STATUS_FIRST + 1)
+#define STR_INACTIVE (STR_STATUS_FIRST + 2)
+#define STR_MISC (RC_GLOBALS_BEGIN + 63)
+#define STR_EDIT_ENTRY STR_MISC
+#define STR_DELETE_ENTRY (STR_MISC + 1)
+
+#define STR_GLOBAL_CONTEXT_FIRST (STR_DELETE_ENTRY + 1)
+#define STR_UPDATE (STR_GLOBAL_CONTEXT_FIRST )
+#define STR_EDIT_CONTENT (STR_GLOBAL_CONTEXT_FIRST + 1)
+#define STR_EDIT_INSERT (STR_GLOBAL_CONTEXT_FIRST + 2)
+#define STR_INDEX (STR_GLOBAL_CONTEXT_FIRST + 3)
+#define STR_FILE (STR_GLOBAL_CONTEXT_FIRST + 4)
+#define STR_NEW_FILE (STR_GLOBAL_CONTEXT_FIRST + 5)
+#define STR_INSERT_TEXT (STR_GLOBAL_CONTEXT_FIRST + 6)
+#define STR_DELETE (STR_GLOBAL_CONTEXT_FIRST + 7)
+#define STR_UPDATE_SEL (STR_GLOBAL_CONTEXT_FIRST + 8)
+#define STR_UPDATE_INDEX (STR_GLOBAL_CONTEXT_FIRST + 9)
+#define STR_UPDATE_LINK (STR_GLOBAL_CONTEXT_FIRST +10)
+#define STR_UPDATE_ALL (STR_GLOBAL_CONTEXT_FIRST +11)
+#define STR_BROKEN_LINK (STR_GLOBAL_CONTEXT_FIRST +12)
+#define STR_EDIT_LINK (STR_GLOBAL_CONTEXT_FIRST +13)
+
+#define STR_REMOVE_INDEX (STR_GLOBAL_CONTEXT_FIRST +30)
+#define STR_REMOVE_TBL_PROTECTION (STR_GLOBAL_CONTEXT_FIRST +31)
+#define STR_RENAME (STR_GLOBAL_CONTEXT_FIRST +32)
+#define STR_READONLY_IDX (STR_GLOBAL_CONTEXT_FIRST +33)
+#define STR_INVISIBLE (STR_GLOBAL_CONTEXT_FIRST +34)
+
+#define STR_POSTIT_SHOW (STR_GLOBAL_CONTEXT_FIRST +35)
+#define STR_POSTIT_HIDE (STR_GLOBAL_CONTEXT_FIRST +36)
+#define STR_POSTIT_DELETE (STR_GLOBAL_CONTEXT_FIRST +37)
+
// ACC ---------------------------------------------------------------
#define FN_CHAR_LEFT_SEL (RC_GLOBALS_BEGIN + 1)
@@ -133,6 +176,7 @@
#define SID_FAX_LIST (RC_GLOBALS_BEGIN + 116)
#define SID_WRT_SHELL (RC_GLOBALS_BEGIN + 117)
+
#endif // _GLOBALS_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 80beca9..201b48b 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -782,15 +782,15 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
: SvTreeListBox(pParent, rResId)
, sSpace(OUString(" "))
- , sRemoveIdx(SW_RES(ST_REMOVE_INDEX))
- , sUpdateIdx(SW_RES(ST_UPDATE))
- , sUnprotTable(SW_RES(ST_REMOVE_TBL_PROTECTION))
- , sRename(SW_RES(ST_RENAME))
- , sReadonlyIdx(SW_RES(ST_READONLY_IDX))
- , sInvisible(SW_RES(ST_INVISIBLE))
- , sPostItShow(SW_RES(ST_POSTIT_SHOW))
- , sPostItHide(SW_RES(ST_POSTIT_HIDE))
- , sPostItDelete(SW_RES(ST_POSTIT_DELETE))
+ , sRemoveIdx(SW_RES(STR_REMOVE_INDEX))
+ , sUpdateIdx(SW_RES(STR_UPDATE))
+ , sUnprotTable(SW_RES(STR_REMOVE_TBL_PROTECTION))
+ , sRename(SW_RES(STR_RENAME))
+ , sReadonlyIdx(SW_RES(STR_READONLY_IDX))
+ , sInvisible(SW_RES(STR_INVISIBLE))
+ , sPostItShow(SW_RES(STR_POSTIT_SHOW))
+ , sPostItHide(SW_RES(STR_POSTIT_HIDE))
+ , sPostItDelete(SW_RES(STR_POSTIT_DELETE))
, pHiddenShell(0)
, pActiveShell(0)
, pConfig(SW_MOD()->GetNavigationConfig())
@@ -825,7 +825,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
}
for (int i = 0; i < CONTEXT_COUNT; ++i)
{
- aContextStrings[i] = SW_RESSTR(i+ST_CONTEXT_FIRST);
+ aContextStrings[i] = SW_RESSTR(i+STR_CONTEXT_FIRST);
}
nActiveBlock = pConfig->GetActiveBlock();
aUpdTimer.SetTimeoutHdl(LINK(this, SwContentTree, TimerUpdate));
@@ -1131,7 +1131,7 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
for(int i=0; i < 3; ++i)
{
pSubPop2->InsertItem( i + 201, aContextStrings[
- ST_HYPERLINK - ST_CONTEXT_FIRST + i]);
+ STR_HYPERLINK - STR_CONTEXT_FIRST + i]);
}
pSubPop2->CheckItem( 201 +
static_cast<int>(GetParentWindow()->GetRegionDropMode()));
@@ -1145,7 +1145,7 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
if(pView == pActiveView)
{
sInsert += "(";
- sInsert += aContextStrings[ ST_ACTIVE - ST_CONTEXT_FIRST];
+ sInsert += aContextStrings[ STR_ACTIVE - STR_CONTEXT_FIRST];
sInsert += ")";
}
pSubPop3->InsertItem(nId, sInsert);
@@ -1154,12 +1154,12 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
pView = SwModule::GetNextView(pView);
nId++;
}
- pSubPop3->InsertItem(nId++, aContextStrings[ST_ACTIVE_VIEW - ST_CONTEXT_FIRST]);
+ pSubPop3->InsertItem(nId++, aContextStrings[STR_ACTIVE_VIEW - STR_CONTEXT_FIRST]);
if(pHiddenShell)
{
OUString sHiddenEntry = pHiddenShell->GetView().GetDocShell()->GetTitle();
sHiddenEntry += " ( ";
- sHiddenEntry += aContextStrings[ ST_HIDDEN - ST_CONTEXT_FIRST];
+ sHiddenEntry += aContextStrings[ STR_HIDDEN - STR_CONTEXT_FIRST];
sHiddenEntry += " )";
pSubPop3->InsertItem(nId, sHiddenEntry);
}
@@ -1169,9 +1169,9 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
else if(bIsHidden)
pSubPop3->CheckItem( nId );
- pPop->InsertItem( 1, aContextStrings[ST_OUTLINE_LEVEL - ST_CONTEXT_FIRST]);
- pPop->InsertItem(2, aContextStrings[ST_DRAGMODE - ST_CONTEXT_FIRST]);
- pPop->InsertItem(3, aContextStrings[ST_DISPLAY - ST_CONTEXT_FIRST]);
+ pPop->InsertItem( 1, aContextStrings[STR_OUTLINE_LEVEL - STR_CONTEXT_FIRST]);
+ pPop->InsertItem(2, aContextStrings[STR_DRAGMODE - STR_CONTEXT_FIRST]);
+ pPop->InsertItem(3, aContextStrings[STR_DISPLAY - STR_CONTEXT_FIRST]);
// Now edit
SvTreeListEntry* pEntry = 0;
// Edit only if the shown content is coming from the current view.
@@ -1207,38 +1207,38 @@ std::unique_ptr<PopupMenu> SwContentTree::CreateContextMenu()
const SwTOXBase* pBase = static_cast<SwTOXBaseContent*>(pEntry->GetUserData())->GetTOXBase();
if(!pBase->IsTOXBaseInReadonly())
- pSubPop4->InsertItem(403, aContextStrings[ST_EDIT_ENTRY - ST_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(403, aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
pSubPop4->InsertItem(405, sReadonlyIdx);
pSubPop4->CheckItem( 405, SwEditShell::IsTOXBaseReadonly(*pBase));
- pSubPop4->InsertItem(501, aContextStrings[ST_DELETE_ENTRY - ST_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(501, aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
}
else if(ContentTypeId::TABLE == nContentType && !bReadonly)
{
bSubPop4 = true;
- pSubPop4->InsertItem(403, aContextStrings[ST_EDIT_ENTRY - ST_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(403, aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
pSubPop4->InsertItem(404, sUnprotTable);
bool bFull = false;
OUString sTableName = static_cast<SwContent*>(pEntry->GetUserData())->GetName();
bool bProt = pActiveShell->HasTableAnyProtection( &sTableName, &bFull );
pSubPop4->EnableItem(403, !bFull );
pSubPop4->EnableItem(404, bProt );
- pSubPop4->InsertItem(501, aContextStrings[ST_DELETE_ENTRY - ST_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(501, aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
}
else if(bEditable || bDeletable)
{
if(bEditable && bDeletable)
{
- pSubPop4->InsertItem(403, aContextStrings[ST_EDIT_ENTRY - ST_CONTEXT_FIRST]);
- pSubPop4->InsertItem(501, aContextStrings[ST_DELETE_ENTRY - ST_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(403, aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(501, aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
bSubPop4 = true;
}
else if(bEditable)
- pPop->InsertItem(403, aContextStrings[ST_EDIT_ENTRY - ST_CONTEXT_FIRST]);
+ pPop->InsertItem(403, aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
else if(bDeletable)
{
- pSubPop4->InsertItem(501, aContextStrings[ST_DELETE_ENTRY - ST_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(501, aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
}
}
//Rename object
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 1cf278a..9fa8273 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -170,7 +170,7 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, const ResId& rResId) :
aUpdateTimer.Start();
for(sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++)
{
- aContextStrings[i] = SW_RESSTR(i+ ST_GLOBAL_CONTEXT_FIRST);
+ aContextStrings[i] = SW_RESSTR(i+ STR_GLOBAL_CONTEXT_FIRST);
}
SetHelpId(HID_NAVIGATOR_GLOB_TREELIST);
SelectHdl();
@@ -344,33 +344,33 @@ std::unique_ptr<PopupMenu> SwGlobalTree::CreateContextMenu()
for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++)
{
- pSubPop2->InsertItem( i, aContextStrings[ST_UPDATE_SEL - ST_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
+ pSubPop2->InsertItem( i, aContextStrings[STR_UPDATE_SEL - STR_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
pSubPop2->SetHelpId(i, aHelpForMenu[i]);
}
pSubPop2->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL));
- pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, aContextStrings[ST_INDEX - ST_GLOBAL_CONTEXT_FIRST]);
+ pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, aContextStrings[STR_INDEX - STR_GLOBAL_CONTEXT_FIRST]);
pSubPop1->SetHelpId(CTX_INSERT_ANY_INDEX, aHelpForMenu[CTX_INSERT_ANY_INDEX]);
- pSubPop1->InsertItem(CTX_INSERT_FILE, aContextStrings[ST_FILE - ST_GLOBAL_CONTEXT_FIRST]);
+ pSubPop1->InsertItem(CTX_INSERT_FILE, aContextStrings[STR_FILE - STR_GLOBAL_CONTEXT_FIRST]);
pSubPop1->SetHelpId(CTX_INSERT_FILE, aHelpForMenu[CTX_INSERT_FILE]);
- pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, aContextStrings[ST_NEW_FILE - ST_GLOBAL_CONTEXT_FIRST]);
+ pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, aContextStrings[STR_NEW_FILE - STR_GLOBAL_CONTEXT_FIRST]);
pSubPop1->SetHelpId(CTX_INSERT_NEW_FILE, aHelpForMenu[CTX_INSERT_NEW_FILE]);
- pSubPop1->InsertItem(CTX_INSERT_TEXT, aContextStrings[ST_TEXT - ST_GLOBAL_CONTEXT_FIRST]);
+ pSubPop1->InsertItem(CTX_INSERT_TEXT, aContextStrings[STR_INSERT_TEXT - STR_GLOBAL_CONTEXT_FIRST]);
pSubPop1->SetHelpId(CTX_INSERT_TEXT, aHelpForMenu[CTX_INSERT_TEXT]);
- pPop->InsertItem(CTX_UPDATE, aContextStrings[ST_UPDATE - ST_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_UPDATE, aContextStrings[STR_UPDATE - STR_GLOBAL_CONTEXT_FIRST]);
pPop->SetHelpId(CTX_UPDATE, aHelpForMenu[CTX_UPDATE]);
- pPop->InsertItem(CTX_EDIT, aContextStrings[ST_EDIT_CONTENT - ST_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_EDIT, aContextStrings[STR_EDIT_CONTENT - STR_GLOBAL_CONTEXT_FIRST]);
pPop->SetHelpId(CTX_EDIT, aHelpForMenu[CTX_EDIT]);
if(nEnableFlags&ENABLE_EDIT_LINK)
{
- pPop->InsertItem(CTX_EDIT_LINK, aContextStrings[ST_EDIT_LINK - ST_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_EDIT_LINK, aContextStrings[STR_EDIT_LINK - STR_GLOBAL_CONTEXT_FIRST]);
pPop->SetHelpId(CTX_EDIT_LINK, aHelpForMenu[CTX_EDIT_LINK]);
}
- pPop->InsertItem(CTX_INSERT, aContextStrings[ST_INSERT - ST_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_INSERT, aContextStrings[STR_EDIT_INSERT - STR_GLOBAL_CONTEXT_FIRST]);
pPop->SetHelpId(CTX_INSERT, aHelpForMenu[CTX_INSERT]);
pPop->InsertSeparator() ;
- pPop->InsertItem(CTX_DELETE, aContextStrings[ST_DELETE - ST_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_DELETE, aContextStrings[STR_DELETE - STR_GLOBAL_CONTEXT_FIRST]);
pPop->SetHelpId(CTX_DELETE, aHelpForMenu[CTX_DELETE]);
//disabling if applicable
@@ -398,7 +398,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = CTX_INSERT_ANY_INDEX; i <= CTX_INSERT_TEXT; i++)
{
- pMenu->InsertItem( i, aContextStrings[ST_INDEX - ST_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] );
+ pMenu->InsertItem( i, aContextStrings[STR_INDEX - STR_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] );
pMenu->SetHelpId(i, aHelpForMenu[i] );
}
pMenu->EnableItem(CTX_INSERT_ANY_INDEX, 0 != (nEnableFlags & ENABLE_INSERT_IDX ));
@@ -416,7 +416,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++)
{
- pMenu->InsertItem( i, aContextStrings[ST_UPDATE_SEL - ST_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
+ pMenu->InsertItem( i, aContextStrings[STR_UPDATE_SEL - STR_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
pMenu->SetHelpId(i, aHelpForMenu[i] );
}
pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL));
@@ -479,7 +479,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
const SwSection* pSect = pCont->GetSection();
OUString sEntry = pSect->GetLinkFileName().getToken(0, sfx2::cTokenSeparator);
if(!pSect->IsConnectFlag())
- sEntry = aContextStrings[ST_BROKEN_LINK - ST_GLOBAL_CONTEXT_FIRST] + sEntry;
+ sEntry = aContextStrings[STR_BROKEN_LINK - STR_GLOBAL_CONTEXT_FIRST] + sEntry;
Point aEntryPos = GetEntryPosition( pEntry );
aEntryPos.X() = GetTabPos( pEntry, pTab );
@@ -674,7 +674,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData)
{
case GLBLDOC_UNKNOWN:
{
- sEntry = aContextStrings[ST_TEXT - ST_GLOBAL_CONTEXT_FIRST];
+ sEntry = aContextStrings[STR_INSERT_TEXT - STR_GLOBAL_CONTEXT_FIRST];
}
break;
case GLBLDOC_TOXBASE:
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 073e45c..5a0e32e 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -52,6 +52,7 @@
#include <utlui.hrc>
#include "access.hrc"
+#include "globals.hrc"
#include <unomid.h>
#include <memory>
@@ -707,10 +708,10 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
for( sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); i++ )
{
- aContextArr[i] = SW_RESSTR(ST_HYPERLINK + i);
- aStatusArr[i] = SW_RESSTR(ST_STATUS_FIRST + i);
+ aContextArr[i] = SW_RESSTR(STR_HYPERLINK + i);
+ aStatusArr[i] = SW_RESSTR(STR_STATUS_FIRST + i);
}
- aStatusArr[3] = SW_RESSTR(ST_ACTIVE_VIEW);
+ aStatusArr[3] = SW_RESSTR(STR_ACTIVE_VIEW);
FreeResource();
const Size& rOutSize = GetOutputSizePixel();
@@ -1030,10 +1031,10 @@ void SwNavigationPI::UpdateListBox()
if (pView == pActView)
{
nAct = nCount;
- sEntry += aStatusArr[ST_ACTIVE - ST_STATUS_FIRST];
+ sEntry += aStatusArr[STR_ACTIVE - STR_STATUS_FIRST];
}
else
- sEntry += aStatusArr[ST_INACTIVE - ST_STATUS_FIRST];
+ sEntry += aStatusArr[STR_INACTIVE - STR_STATUS_FIRST];
sEntry += ")";
aDocListBox->InsertEntry(sEntry);
@@ -1052,7 +1053,7 @@ void SwNavigationPI::UpdateListBox()
OUString sEntry = aContentTree->GetHiddenWrtShell()->GetView().
GetDocShell()->GetTitle();
sEntry += " (";
- sEntry += aStatusArr[ST_HIDDEN - ST_STATUS_FIRST];
+ sEntry += aStatusArr[STR_HIDDEN - STR_STATUS_FIRST];
sEntry += ")";
aDocListBox->InsertEntry(sEntry);
bDisable = false;
diff --git a/sw/source/uibase/utlui/navipi.hrc b/sw/source/uibase/utlui/navipi.hrc
index 36cab2d..686086f 100644
--- a/sw/source/uibase/utlui/navipi.hrc
+++ b/sw/source/uibase/utlui/navipi.hrc
@@ -24,47 +24,4 @@
#define TL_GLOBAL 55
#define TB_GLOBAL 56
-// Strings for the context menu of the content tree
-#define ST_CONTEXT_FIRST 60
-#define ST_OUTLINE_LEVEL ST_CONTEXT_FIRST
-#define ST_DRAGMODE (ST_CONTEXT_FIRST + 1)
-#define ST_HYPERLINK (ST_CONTEXT_FIRST + 2)
-#define ST_LINK_REGION (ST_CONTEXT_FIRST + 3)
-#define ST_COPY_REGION (ST_CONTEXT_FIRST + 4)
-#define ST_DISPLAY (ST_CONTEXT_FIRST + 5)
-#define ST_ACTIVE_VIEW (ST_CONTEXT_FIRST + 6)
-#define ST_STATUS_FIRST 67
-#define ST_HIDDEN (ST_STATUS_FIRST )
-#define ST_ACTIVE (ST_STATUS_FIRST + 1)
-#define ST_INACTIVE (ST_STATUS_FIRST + 2)
-#define ST_MISC 70
-#define ST_EDIT_ENTRY ST_MISC
-#define ST_DELETE_ENTRY (ST_MISC + 1)
-
-#define ST_GLOBAL_CONTEXT_FIRST (ST_DELETE_ENTRY + 1)
-#define ST_UPDATE (ST_GLOBAL_CONTEXT_FIRST )
-#define ST_EDIT_CONTENT (ST_GLOBAL_CONTEXT_FIRST + 1)
-#define ST_INSERT (ST_GLOBAL_CONTEXT_FIRST + 2)
-#define ST_INDEX (ST_GLOBAL_CONTEXT_FIRST + 3)
-#define ST_FILE (ST_GLOBAL_CONTEXT_FIRST + 4)
-#define ST_NEW_FILE (ST_GLOBAL_CONTEXT_FIRST + 5)
-#define ST_TEXT (ST_GLOBAL_CONTEXT_FIRST + 6)
-#define ST_DELETE (ST_GLOBAL_CONTEXT_FIRST + 7)
-#define ST_UPDATE_SEL (ST_GLOBAL_CONTEXT_FIRST + 8)
-#define ST_UPDATE_INDEX (ST_GLOBAL_CONTEXT_FIRST + 9)
-#define ST_UPDATE_LINK (ST_GLOBAL_CONTEXT_FIRST +10)
-#define ST_UPDATE_ALL (ST_GLOBAL_CONTEXT_FIRST +11)
-#define ST_BROKEN_LINK (ST_GLOBAL_CONTEXT_FIRST +12)
-#define ST_EDIT_LINK (ST_GLOBAL_CONTEXT_FIRST +13)
-
-#define ST_REMOVE_INDEX (ST_GLOBAL_CONTEXT_FIRST +30)
-#define ST_REMOVE_TBL_PROTECTION (ST_GLOBAL_CONTEXT_FIRST +31)
-#define ST_RENAME (ST_GLOBAL_CONTEXT_FIRST +32)
-#define ST_READONLY_IDX (ST_GLOBAL_CONTEXT_FIRST +33)
-#define ST_INVISIBLE (ST_GLOBAL_CONTEXT_FIRST +34)
-
-#define ST_POSTIT_SHOW (ST_GLOBAL_CONTEXT_FIRST +35)
-#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36)
-#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37)
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
index cf9ec60..aaa15cd 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -18,6 +18,7 @@
*/
#include "cmdid.h"
+#include "globals.hrc"
#include "utlui.hrc"
#include "navipi.hrc"
#include "helpid.h"
@@ -310,142 +311,6 @@ Window DLG_NAVIGATION_PI
Last = 5 ;
Value = 5 ;
};
- String ST_OUTLINE_LEVEL
- {
- Text [ en-US ] = "Outline Level" ;
- };
- String ST_DRAGMODE
- {
- Text [ en-US ] = "Drag Mode" ;
- };
- String ST_HYPERLINK
- {
- Text [ en-US ] = "Insert as Hyperlink" ;
- };
- String ST_LINK_REGION
- {
- Text [ en-US ] = "Insert as Link" ;
- };
- String ST_COPY_REGION
- {
- Text [ en-US ] = "Insert as Copy" ;
- };
- String ST_DISPLAY
- {
- Text [ en-US ] = "Display" ;
- };
- String ST_ACTIVE_VIEW
- {
- Text [ en-US ] = "Active Window" ;
- };
- String ST_HIDDEN
- {
- Text [ en-US ] = "hidden" ;
- };
- String ST_ACTIVE
- {
- Text [ en-US ] = "active" ;
- };
- String ST_INACTIVE
- {
- Text [ en-US ] = "inactive" ;
- };
- String ST_EDIT_ENTRY
- {
- Text [ en-US ] = "Edit..." ;
- };
- String ST_UPDATE
- {
- Text [ en-US ] = "~Update" ;
- };
- String ST_EDIT_CONTENT
- {
- Text [ en-US ] = "Edit" ;
- };
- String ST_EDIT_LINK
- {
- Text [ en-US ] = "Edit link";
- };
- String ST_INSERT
- {
- Text [ en-US ] = "Insert" ;
- };
- String ST_INDEX
- {
- Text [ en-US ] = "~Index";
- };
- String ST_FILE
- {
- Text [ en-US ] = "File" ;
- };
- String ST_NEW_FILE
- {
- Text [ en-US ] = "New Document" ;
- };
- String ST_TEXT
- {
- Text [ en-US ] = "Text" ;
- };
- String ST_DELETE
- {
- Text [ en-US ] = "Delete" ;
- };
- String ST_DELETE_ENTRY
- {
- Text [ en-US ] = "~Delete" ;
- };
- String ST_UPDATE_SEL
- {
- Text [ en-US ] = "Selection" ;
- };
- String ST_UPDATE_INDEX
- {
- Text [ en-US ] = "Indexes" ;
- };
- String ST_UPDATE_LINK
- {
- Text [ en-US ] = "Links" ;
- };
- String ST_UPDATE_ALL
- {
- Text [ en-US ] = "All" ;
- };
- String ST_REMOVE_INDEX
- {
- Text [ en-US ] = "~Remove Index" ;
- };
- String ST_REMOVE_TBL_PROTECTION
- {
- Text [ en-US ] = "~Unprotect" ;
- };
- String ST_INVISIBLE
- {
- Text [ en-US ] = "hidden";
- };
- String ST_BROKEN_LINK
- {
- Text [ en-US ] = "File not found: ";
- };
- String ST_RENAME
- {
- Text [ en-US ] = "~Rename";
- };
- String ST_READONLY_IDX
- {
- Text [ en-US ] = "Read-~only";
- };
- String ST_POSTIT_SHOW
- {
- Text [ en-US ] = "Show All";
- };
- String ST_POSTIT_HIDE
- {
- Text [ en-US ] = "Hide All";
- };
- String ST_POSTIT_DELETE
- {
- Text [ en-US ] = "Delete All";
- };
};
#define NAVI_ENTRY_IDS \
IdList = \
@@ -480,5 +345,141 @@ String STR_ACCESS_TL_CONTENT
{
Text [ en-US ] = "Content View";
};
+String STR_OUTLINE_LEVEL
+{
+ Text [ en-US ] = "Outline Level" ;
+};
+String STR_DRAGMODE
+{
+ Text [ en-US ] = "Drag Mode" ;
+};
+String STR_HYPERLINK
+{
+ Text [ en-US ] = "Insert as Hyperlink" ;
+};
+String STR_LINK_REGION
+{
+ Text [ en-US ] = "Insert as Link" ;
+};
+String STR_COPY_REGION
+{
+ Text [ en-US ] = "Insert as Copy" ;
+};
+String STR_DISPLAY
+{
+ Text [ en-US ] = "Display" ;
+};
+String STR_ACTIVE_VIEW
+{
+ Text [ en-US ] = "Active Window" ;
+};
+String STR_HIDDEN
+{
+ Text [ en-US ] = "hidden" ;
+};
+String STR_ACTIVE
+{
+ Text [ en-US ] = "active" ;
+};
+String STR_INACTIVE
+{
+ Text [ en-US ] = "inactive" ;
+};
+String STR_EDIT_ENTRY
+{
+ Text [ en-US ] = "Edit..." ;
+};
+String STR_UPDATE
+{
+ Text [ en-US ] = "~Update" ;
+};
+String STR_EDIT_CONTENT
+{
+ Text [ en-US ] = "Edit" ;
+};
+String STR_EDIT_LINK
+{
+ Text [ en-US ] = "Edit link";
+};
+String STR_EDIT_INSERT
+{
+ Text [ en-US ] = "Insert" ;
+};
+String STR_INDEX
+{
+ Text [ en-US ] = "~Index";
+};
+String STR_FILE
+{
+ Text [ en-US ] = "File" ;
+};
+String STR_NEW_FILE
+{
+ Text [ en-US ] = "New Document" ;
+};
+String STR_INSERT_TEXT
+{
+ Text [ en-US ] = "Text" ;
+};
+String STR_DELETE
+{
+ Text [ en-US ] = "Delete" ;
+};
+String STR_DELETE_ENTRY
+{
+ Text [ en-US ] = "~Delete" ;
+};
+String STR_UPDATE_SEL
+{
+ Text [ en-US ] = "Selection" ;
+};
+String STR_UPDATE_INDEX
+{
+ Text [ en-US ] = "Indexes" ;
+};
+String STR_UPDATE_LINK
+{
+ Text [ en-US ] = "Links" ;
+};
+String STR_UPDATE_ALL
+{
+ Text [ en-US ] = "All" ;
+};
+String STR_REMOVE_INDEX
+{
+ Text [ en-US ] = "~Remove Index" ;
+};
+String STR_REMOVE_TBL_PROTECTION
+{
+ Text [ en-US ] = "~Unprotect" ;
+};
+String STR_INVISIBLE
+{
+ Text [ en-US ] = "hidden";
+};
+String STR_BROKEN_LINK
+{
+ Text [ en-US ] = "File not found: ";
+};
+String STR_RENAME
+{
+ Text [ en-US ] = "~Rename";
+};
+String STR_READONLY_IDX
+{
+ Text [ en-US ] = "Read-~only";
+};
+String STR_POSTIT_SHOW
+{
+ Text [ en-US ] = "Show All";
+};
+String STR_POSTIT_HIDE
+{
+ Text [ en-US ] = "Hide All";
+};
+String STR_POSTIT_DELETE
+{
+ Text [ en-US ] = "Delete All";
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list