Kaydet (Commit) 4707f7bb authored tarafından Rüdiger Timm's avatar Rüdiger Timm

CWS-TOOLING: integrate CWS cmcfixes51

2008-12-08 10:12:55 +0100 cmc  r264975 : #i96203# protect with ifdefs to avoid unused symbol on mac
2008-12-05 12:23:47 +0100 cmc  r264898 : CWS-TOOLING: rebase CWS cmcfixes51 to trunk@264807 (milestone: DEV300:m37)
2008-12-01 14:45:17 +0100 cmc  r264606 : #i76655# ehlos apparently required
2008-11-28 17:49:30 +0100 cmc  r264567 : #i96655# remove newly unused method
2008-11-28 10:41:28 +0100 cmc  r264531 : #i96647# better ppc-bridges flushCode impl
2008-11-27 12:58:40 +0100 cmc  r264478 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 12:32:49 +0100 cmc  r264476 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 12:26:02 +0100 cmc  r264475 : #i96655# redundant old table export helpers
2008-11-27 11:49:06 +0100 cmc  r264473 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:38:35 +0100 cmc  r264471 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:14:21 +0100 cmc  r264467 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:06:22 +0100 cmc  r264464 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:58:18 +0100 cmc  r264462 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:41:44 +0100 cmc  r264461 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:19:24 +0100 cmc  r264460 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:13:39 +0100 cmc  r264459 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:06:14 +0100 cmc  r264458 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:59:54 +0100 cmc  r264457 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:52:51 +0100 cmc  r264456 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:48:26 +0100 cmc  r264454 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:40:20 +0100 cmc  r264452 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:35:26 +0100 cmc  r264451 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:31:00 +0100 cmc  r264450 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:24:08 +0100 cmc  r264449 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:26:15 +0100 cmc  r264443 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:21:01 +0100 cmc  r264442 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:09:40 +0100 cmc  r264441 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 23:51:56 +0100 cmc  r264440 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 23:49:09 +0100 cmc  r264439 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 18:09:54 +0100 cmc  r264432 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 18:07:40 +0100 cmc  r264431 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:28:02 +0100 cmc  r264429 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:27:39 +0100 cmc  r264428 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:18:36 +0100 cmc  r264426 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 16:22:16 +0100 cmc  r264415 : #i96624# make implicit braces and brackets explicit to avoid warnings
2008-11-26 16:00:23 +0100 cmc  r264409 : #i90426# remove warnings from svtools
2008-11-26 15:59:17 +0100 cmc  r264408 : #i90426# remove warnings
2008-11-26 15:47:32 +0100 cmc  r264404 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:46:57 +0100 cmc  r264394 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:19:50 +0100 cmc  r264387 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:15:26 +0100 cmc  r264386 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:11:26 +0100 cmc  r264384 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 13:44:23 +0100 cmc  r264380 : #i96084# comfirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 13:12:24 +0100 cmc  r264372 : #i96604# silence new warnings
2008-11-26 12:35:02 +0100 cmc  r264369 : #i96203# make qstarter work in 3-layer land
2008-11-26 12:33:04 +0100 cmc  r264368 : #i96170# ensure gtypes are up and running
üst d4fe0312
...@@ -247,10 +247,12 @@ uno::Reference<XAccessible> SAL_CALL ...@@ -247,10 +247,12 @@ uno::Reference<XAccessible> SAL_CALL
// Take care of children of the base class. // Take care of children of the base class.
sal_Int32 nCount = AccessibleDocumentViewBase::getAccessibleChildCount(); sal_Int32 nCount = AccessibleDocumentViewBase::getAccessibleChildCount();
if (nCount > 0) if (nCount > 0)
{
if (nIndex < nCount) if (nIndex < nCount)
return AccessibleDocumentViewBase::getAccessibleChild(nIndex); return AccessibleDocumentViewBase::getAccessibleChild(nIndex);
else else
nIndex -= nCount; nIndex -= nCount;
}
// Create a copy of the pointer to the children manager and release the // Create a copy of the pointer to the children manager and release the
// mutex before calling any of its methods. // mutex before calling any of its methods.
......
...@@ -333,6 +333,7 @@ void AccessibleTreeNode::UpdateState( ...@@ -333,6 +333,7 @@ void AccessibleTreeNode::UpdateState(
bool bValue) bool bValue)
{ {
if ((mrStateSet->contains(aState)!=sal_False) != bValue) if ((mrStateSet->contains(aState)!=sal_False) != bValue)
{
if (bValue) if (bValue)
{ {
mrStateSet->AddState(aState); mrStateSet->AddState(aState);
...@@ -343,6 +344,7 @@ void AccessibleTreeNode::UpdateState( ...@@ -343,6 +344,7 @@ void AccessibleTreeNode::UpdateState(
mrStateSet->RemoveState(aState); mrStateSet->RemoveState(aState);
FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(aState),Any()); FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(aState),Any());
} }
}
} }
......
...@@ -593,10 +593,12 @@ void SdPageObjsTLB::SetShowAllShapes ( ...@@ -593,10 +593,12 @@ void SdPageObjsTLB::SetShowAllShapes (
{ {
mbShowAllShapes = bShowAllShapes; mbShowAllShapes = bShowAllShapes;
if (bFillList) if (bFillList)
{
if (mpMedium == NULL) if (mpMedium == NULL)
Fill(mpDoc, mbShowAllPages, maDocName); Fill(mpDoc, mbShowAllPages, maDocName);
else else
Fill(mpDoc, mpMedium, maDocName); Fill(mpDoc, mpMedium, maDocName);
}
} }
...@@ -880,8 +882,10 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry ) ...@@ -880,8 +882,10 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed) SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
{ {
if (!mpBookmarkDoc || if (
pMed && (!mpOwnMedium || mpOwnMedium->GetName() != pMed->GetName())) !mpBookmarkDoc ||
(pMed && (!mpOwnMedium || mpOwnMedium->GetName() != pMed->GetName()))
)
{ {
// create a new BookmarkDoc if now one exists or if a new Medium is provided // create a new BookmarkDoc if now one exists or if a new Medium is provided
if (mpOwnMedium != pMed) if (mpOwnMedium != pMed)
......
...@@ -363,10 +363,12 @@ sal_Int16 ResourceId::CompareToLocalImplementation (const ResourceId& rId) const ...@@ -363,10 +363,12 @@ sal_Int16 ResourceId::CompareToLocalImplementation (const ResourceId& rId) const
// two resource ids are equivalent. Otherwise the shorter comes // two resource ids are equivalent. Otherwise the shorter comes
// first. // first.
if (nLocalURLCount != nURLCount) if (nLocalURLCount != nURLCount)
{
if (nLocalURLCount < nURLCount) if (nLocalURLCount < nURLCount)
nResult = -1; nResult = -1;
else else
nResult = +1; nResult = +1;
}
} }
return nResult; return nResult;
......
...@@ -257,10 +257,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) ...@@ -257,10 +257,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
pStyleSheet->GetFamily() == pOldStyleSheet->GetFamily() || pStyleSheet->GetFamily() == pOldStyleSheet->GetFamily() ||
// allow if old was background objects and new is graphics // allow if old was background objects and new is graphics
pStyleSheet->GetFamily() == SD_STYLE_FAMILY_GRAPHICS && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS || pStyleSheet->GetFamily() == (SD_STYLE_FAMILY_GRAPHICS && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) ||
// allow if old was presentation and we are a drawing document // allow if old was presentation and we are a drawing document
pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW ) (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) )
{ {
mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet); mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet);
mpDoc->SetChanged(TRUE); mpDoc->SetChanged(TRUE);
......
...@@ -118,8 +118,10 @@ void SmGetLeftSelectionPart(const ESelection aSel, ...@@ -118,8 +118,10 @@ void SmGetLeftSelectionPart(const ESelection aSel,
// returns paragraph number and position of the selections left part // returns paragraph number and position of the selections left part
{ {
// compare start and end of selection and use the one that comes first // compare start and end of selection and use the one that comes first
if ( aSel.nStartPara < aSel.nEndPara if (
|| aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) (aSel.nStartPara < aSel.nEndPara) ||
(aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos)
)
{ nPara = aSel.nStartPara; { nPara = aSel.nStartPara;
nPos = aSel.nStartPos; nPos = aSel.nStartPos;
} }
......
...@@ -189,10 +189,12 @@ void GenericPageCache::RequestPreviewBitmap ( ...@@ -189,10 +189,12 @@ void GenericPageCache::RequestPreviewBitmap (
// No, the bitmap is not up-to-date. Request a new one. // No, the bitmap is not up-to-date. Request a new one.
RequestPriorityClass ePriorityClass (NOT_VISIBLE); RequestPriorityClass ePriorityClass (NOT_VISIBLE);
if (mpCacheContext->IsVisible(aKey)) if (mpCacheContext->IsVisible(aKey))
{
if (mpBitmapCache->HasBitmap(pPage)) if (mpBitmapCache->HasBitmap(pPage))
ePriorityClass = VISIBLE_OUTDATED_PREVIEW; ePriorityClass = VISIBLE_OUTDATED_PREVIEW;
else else
ePriorityClass = VISIBLE_NO_PREVIEW; ePriorityClass = VISIBLE_NO_PREVIEW;
}
maRequestQueue.AddRequest(aKey, ePriorityClass); maRequestQueue.AddRequest(aKey, ePriorityClass);
mpQueueProcessor->Start(ePriorityClass); mpQueueProcessor->Start(ePriorityClass);
} }
......
...@@ -117,10 +117,12 @@ void PageSelector::UpdateAllPages (void) ...@@ -117,10 +117,12 @@ void PageSelector::UpdateAllPages (void)
} }
if (bSelectionHasChanged) if (bSelectionHasChanged)
{
if (mnBroadcastDisableLevel > 0) if (mnBroadcastDisableLevel > 0)
mbSelectionChangeBroadcastPending = true; mbSelectionChangeBroadcastPending = true;
else else
mrController.GetSelectionManager()->SelectionHasChanged(); mrController.GetSelectionManager()->SelectionHasChanged();
}
} }
......
...@@ -1062,6 +1062,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) ...@@ -1062,6 +1062,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest)
for (int nIndex=rSelector.GetPageCount()-1; nIndex>=0; --nIndex) for (int nIndex=rSelector.GetPageCount()-1; nIndex>=0; --nIndex)
{ {
if (rSelector.IsPageSelected(nIndex)) if (rSelector.IsPageSelected(nIndex))
{
if (bLastSelectedSlideSeen) if (bLastSelectedSlideSeen)
rSelector.DeselectPage (nIndex); rSelector.DeselectPage (nIndex);
else else
...@@ -1069,6 +1070,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) ...@@ -1069,6 +1070,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest)
nInsertionIndex = nIndex; nInsertionIndex = nIndex;
bLastSelectedSlideSeen = true; bLastSelectedSlideSeen = true;
} }
}
} }
} }
......
...@@ -337,6 +337,7 @@ sal_uInt32 ControlContainer::GetNextIndex ( ...@@ -337,6 +337,7 @@ sal_uInt32 ControlContainer::GetNextIndex (
// Go to the regular successor. // Go to the regular successor.
nCandidate += 1; nCandidate += 1;
if (nCandidate==maControlList.size()) if (nCandidate==maControlList.size())
{
if ( ! bCycle) if ( ! bCycle)
{ {
// We have reached the end of the list of controls and must // We have reached the end of the list of controls and must
...@@ -348,6 +349,7 @@ sal_uInt32 ControlContainer::GetNextIndex ( ...@@ -348,6 +349,7 @@ sal_uInt32 ControlContainer::GetNextIndex (
// Cycle to the head of the list. // Cycle to the head of the list.
nCandidate = 0; nCandidate = 0;
} }
}
if (nCandidate == nIndex) if (nCandidate == nIndex)
{ {
......
...@@ -386,10 +386,12 @@ void TitledControl::UpdateStates (void) ...@@ -386,10 +386,12 @@ void TitledControl::UpdateStates (void)
TreeNode* pControl = GetControl(false); TreeNode* pControl = GetControl(false);
if (pControl!=NULL && pControl->GetWindow() != NULL) if (pControl!=NULL && pControl->GetWindow() != NULL)
{
if (IsVisible() && IsExpanded()) if (IsVisible() && IsExpanded())
pControl->GetWindow()->Show(); pControl->GetWindow()->Show();
else else
pControl->GetWindow()->Hide(); pControl->GetWindow()->Hide();
}
} }
......
...@@ -145,6 +145,7 @@ void TimerBasedTaskExecution::SetSelf ( ...@@ -145,6 +145,7 @@ void TimerBasedTaskExecution::SetSelf (
IMPL_LINK(TimerBasedTaskExecution,TimerCallback, Timer*,EMPTYARG) IMPL_LINK(TimerBasedTaskExecution,TimerCallback, Timer*,EMPTYARG)
{ {
if (mpTask.get() != NULL) if (mpTask.get() != NULL)
{
if (mpTask->HasNextStep()) if (mpTask->HasNextStep())
{ {
// Execute as many steps as fit into the time span of length // Execute as many steps as fit into the time span of length
...@@ -172,6 +173,7 @@ IMPL_LINK(TimerBasedTaskExecution,TimerCallback, Timer*,EMPTYARG) ...@@ -172,6 +173,7 @@ IMPL_LINK(TimerBasedTaskExecution,TimerCallback, Timer*,EMPTYARG)
} }
else else
mpSelf.reset(); mpSelf.reset();
}
return 0; return 0;
} }
......
...@@ -670,8 +670,8 @@ sal_Bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nSta ...@@ -670,8 +670,8 @@ sal_Bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nSta
if(pDescr->IsWords()) if(pDescr->IsWords())
{ {
if( nStartPos > 0 && aText.getStr()[nStartPos-1] > ' ' || if( (nStartPos > 0 && aText.getStr()[nStartPos-1] > ' ') ||
nEndPos < aText.getLength() && aText.getStr()[nEndPos] > ' ') (nEndPos < aText.getLength() && aText.getStr()[nEndPos] > ' ') )
{ {
nStartPos++; nStartPos++;
return Search( aText, nStartPos, nEndPos, pDescr ); return Search( aText, nStartPos, nEndPos, pDescr );
......
...@@ -1235,6 +1235,7 @@ void Outliner::PrepareSpellCheck (void) ...@@ -1235,6 +1235,7 @@ void Outliner::PrepareSpellCheck (void)
// When spell checking we have to test whether we have processed the // When spell checking we have to test whether we have processed the
// whole document and have reached the start page again. // whole document and have reached the start page again.
if (meMode == SPELL) if (meMode == SPELL)
{
if (maSearchStartPosition == ::sd::outliner::Iterator()) if (maSearchStartPosition == ::sd::outliner::Iterator())
// Remember the position of the first text object so that we // Remember the position of the first text object so that we
// know when we have processed the whole document. // know when we have processed the whole document.
...@@ -1243,7 +1244,7 @@ void Outliner::PrepareSpellCheck (void) ...@@ -1243,7 +1244,7 @@ void Outliner::PrepareSpellCheck (void)
{ {
mbEndOfSearch = true; mbEndOfSearch = true;
} }
}
EnterEditMode( FALSE ); EnterEditMode( FALSE );
} }
......
...@@ -647,7 +647,7 @@ BOOL View::IsPresObjSelected(BOOL bOnPage, BOOL bOnMasterPage, BOOL bCheckPresOb ...@@ -647,7 +647,7 @@ BOOL View::IsPresObjSelected(BOOL bOnPage, BOOL bOnMasterPage, BOOL bCheckPresOb
pPage = (SdPage*) pObj->GetPage(); pPage = (SdPage*) pObj->GetPage();
bMasterPage = pPage->IsMasterPage(); bMasterPage = pPage->IsMasterPage();
if (bMasterPage && bOnMasterPage || !bMasterPage && bOnPage) if ( (bMasterPage && bOnMasterPage) || (!bMasterPage && bOnPage) )
{ {
if ( pPage && pPage->IsPresObj(pObj) ) if ( pPage && pPage->IsPresObj(pObj) )
{ {
......
...@@ -922,6 +922,7 @@ void ViewShell::ArrangeGUIElements (void) ...@@ -922,6 +922,7 @@ void ViewShell::ArrangeGUIElements (void)
// Filler in the lower right corner. // Filler in the lower right corner.
if (mpScrollBarBox.get() != NULL) if (mpScrollBarBox.get() != NULL)
{
if (mpHorizontalScrollBar.get()!=NULL if (mpHorizontalScrollBar.get()!=NULL
&& mpHorizontalScrollBar->IsVisible() && mpHorizontalScrollBar->IsVisible()
&& mpVerticalScrollBar.get()!=NULL && mpVerticalScrollBar.get()!=NULL
...@@ -932,6 +933,7 @@ void ViewShell::ArrangeGUIElements (void) ...@@ -932,6 +933,7 @@ void ViewShell::ArrangeGUIElements (void)
} }
else else
mpScrollBarBox->Hide(); mpScrollBarBox->Hide();
}
// Place horizontal ruler below tab bar. // Place horizontal ruler below tab bar.
if (mbHasRulers && mpContentWindow.get() != NULL) if (mbHasRulers && mpContentWindow.get() != NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment