diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | 0fe045d9566b66b766a8dd967e65ad6d57d78e5b (patch) | |
| tree | 7a7506427f1225f68a2179fa9e40f9e013549ea4 /sw/source/ui/utlui/glbltree.cxx | |
| parent | 75999228ead62620ed8b9d3970277bf916af3d6d (diff) | |
| parent | 8409cfd0c4842fae1e087f8c932748f9305871a8 (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'sw/source/ui/utlui/glbltree.cxx')
| -rw-r--r-- | sw/source/ui/utlui/glbltree.cxx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index e9b8fdf6feef..d8849b48e10f 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -117,7 +117,7 @@ using ::rtl::OUString; #define GLBL_TABPOS_SUB 5 const SfxObjectShell* SwGlobalTree::pShowShell = 0; -static const USHORT __FAR_DATA aHelpForMenu[] = +static const char* __FAR_DATA aHelpForMenu[] = { 0, // HID_GLBLTREE_UPDATE, //CTX_UPDATE @@ -1241,11 +1241,20 @@ BOOL SwGlobalTree::Update(BOOL bHard) GlobalDocContentType eType = pLeft->GetType(); SvLBoxEntry* pEntry = GetEntry(i); String sTemp = GetEntryText(pEntry); - if(eType != pRight->GetType() || - eType == GLBLDOC_SECTION && - (pLeft->GetSection()->GetSectionName() != sTemp) || - eType == GLBLDOC_TOXBASE && pLeft->GetTOX()->GetTitle() != sTemp) - bCopy = bRet = TRUE; + if ( + eType != pRight->GetType() || + ( + eType == GLBLDOC_SECTION && + pLeft->GetSection()->GetSectionName() != sTemp + ) || + ( + eType == GLBLDOC_TOXBASE && + pLeft->GetTOX()->GetTitle() != sTemp + ) + ) + { + bCopy = bRet = TRUE; + } } } if(bCopy || bHard) |