summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-12-11 07:05:03 +0000
committerRüdiger Timm <rt@openoffice.org>2008-12-11 07:05:03 +0000
commit4707f7bb54d143e642ad5df5eedf56d5d2b08385 (patch)
tree539c7ae8515b53c85259f50435db277792072f04 /sd/source
parentd4fe0312f57f288e3c1cdfdd57457c223d953c4c (diff)
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
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx2
-rw-r--r--sd/source/ui/accessibility/AccessibleTreeNode.cxx2
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx8
-rw-r--r--sd/source/ui/framework/configuration/ResourceId.cxx2
-rw-r--r--sd/source/ui/func/futempl.cxx4
-rwxr-xr-xsd/source/ui/notes/EditWindow.cxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsPageSelector.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx2
-rw-r--r--sd/source/ui/toolpanel/ControlContainer.cxx2
-rw-r--r--sd/source/ui/toolpanel/TitledControl.cxx2
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx2
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx4
-rw-r--r--sd/source/ui/view/Outliner.cxx3
-rw-r--r--sd/source/ui/view/sdview.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx2
16 files changed, 37 insertions, 10 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index ee12a4138575..1d12a03809b4 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -247,10 +247,12 @@ uno::Reference<XAccessible> SAL_CALL
// Take care of children of the base class.
sal_Int32 nCount = AccessibleDocumentViewBase::getAccessibleChildCount();
if (nCount > 0)
+ {
if (nIndex < nCount)
return AccessibleDocumentViewBase::getAccessibleChild(nIndex);
else
nIndex -= nCount;
+ }
// Create a copy of the pointer to the children manager and release the
// mutex before calling any of its methods.
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 82fcf587c027..e4626711df82 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -333,6 +333,7 @@ void AccessibleTreeNode::UpdateState(
bool bValue)
{
if ((mrStateSet->contains(aState)!=sal_False) != bValue)
+ {
if (bValue)
{
mrStateSet->AddState(aState);
@@ -343,6 +344,7 @@ void AccessibleTreeNode::UpdateState(
mrStateSet->RemoveState(aState);
FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(aState),Any());
}
+ }
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 1f28e3804aa8..09f2b1b09c5b 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -593,10 +593,12 @@ void SdPageObjsTLB::SetShowAllShapes (
{
mbShowAllShapes = bShowAllShapes;
if (bFillList)
+ {
if (mpMedium == NULL)
Fill(mpDoc, mbShowAllPages, maDocName);
else
Fill(mpDoc, mpMedium, maDocName);
+ }
}
@@ -880,8 +882,10 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed)
{
- if (!mpBookmarkDoc ||
- pMed && (!mpOwnMedium || mpOwnMedium->GetName() != pMed->GetName()))
+ if (
+ !mpBookmarkDoc ||
+ (pMed && (!mpOwnMedium || mpOwnMedium->GetName() != pMed->GetName()))
+ )
{
// create a new BookmarkDoc if now one exists or if a new Medium is provided
if (mpOwnMedium != pMed)
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index dd9b244d9b9d..b3fd4f3f3974 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -363,10 +363,12 @@ sal_Int16 ResourceId::CompareToLocalImplementation (const ResourceId& rId) const
// two resource ids are equivalent. Otherwise the shorter comes
// first.
if (nLocalURLCount != nURLCount)
+ {
if (nLocalURLCount < nURLCount)
nResult = -1;
else
nResult = +1;
+ }
}
return nResult;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 15e0c27b86c9..078b97324d1a 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -257,10 +257,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
pStyleSheet->GetFamily() == pOldStyleSheet->GetFamily() ||
// 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
- 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);
mpDoc->SetChanged(TRUE);
diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx
index b9522904b4d4..3766e385b58b 100755
--- a/sd/source/ui/notes/EditWindow.cxx
+++ b/sd/source/ui/notes/EditWindow.cxx
@@ -118,8 +118,10 @@ void SmGetLeftSelectionPart(const ESelection aSel,
// returns paragraph number and position of the selections left part
{
// compare start and end of selection and use the one that comes first
- if ( aSel.nStartPara < aSel.nEndPara
- || aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos)
+ if (
+ (aSel.nStartPara < aSel.nEndPara) ||
+ (aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos)
+ )
{ nPara = aSel.nStartPara;
nPos = aSel.nStartPos;
}
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
index bc775be34a31..702517029fb6 100644
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
@@ -189,10 +189,12 @@ void GenericPageCache::RequestPreviewBitmap (
// No, the bitmap is not up-to-date. Request a new one.
RequestPriorityClass ePriorityClass (NOT_VISIBLE);
if (mpCacheContext->IsVisible(aKey))
+ {
if (mpBitmapCache->HasBitmap(pPage))
ePriorityClass = VISIBLE_OUTDATED_PREVIEW;
else
ePriorityClass = VISIBLE_NO_PREVIEW;
+ }
maRequestQueue.AddRequest(aKey, ePriorityClass);
mpQueueProcessor->Start(ePriorityClass);
}
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index a5b3023ed509..0c69a2b27c11 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -117,10 +117,12 @@ void PageSelector::UpdateAllPages (void)
}
if (bSelectionHasChanged)
+ {
if (mnBroadcastDisableLevel > 0)
mbSelectionChangeBroadcastPending = true;
else
mrController.GetSelectionManager()->SelectionHasChanged();
+ }
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 3ee7fd1a2efc..2fddf952e18e 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1062,6 +1062,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest)
for (int nIndex=rSelector.GetPageCount()-1; nIndex>=0; --nIndex)
{
if (rSelector.IsPageSelected(nIndex))
+ {
if (bLastSelectedSlideSeen)
rSelector.DeselectPage (nIndex);
else
@@ -1069,6 +1070,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest)
nInsertionIndex = nIndex;
bLastSelectedSlideSeen = true;
}
+ }
}
}
diff --git a/sd/source/ui/toolpanel/ControlContainer.cxx b/sd/source/ui/toolpanel/ControlContainer.cxx
index 7843927bea81..fe4e2a629a6d 100644
--- a/sd/source/ui/toolpanel/ControlContainer.cxx
+++ b/sd/source/ui/toolpanel/ControlContainer.cxx
@@ -337,6 +337,7 @@ sal_uInt32 ControlContainer::GetNextIndex (
// Go to the regular successor.
nCandidate += 1;
if (nCandidate==maControlList.size())
+ {
if ( ! bCycle)
{
// We have reached the end of the list of controls and must
@@ -348,6 +349,7 @@ sal_uInt32 ControlContainer::GetNextIndex (
// Cycle to the head of the list.
nCandidate = 0;
}
+ }
if (nCandidate == nIndex)
{
diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx
index f864792288a4..14c7c5004e91 100644
--- a/sd/source/ui/toolpanel/TitledControl.cxx
+++ b/sd/source/ui/toolpanel/TitledControl.cxx
@@ -386,10 +386,12 @@ void TitledControl::UpdateStates (void)
TreeNode* pControl = GetControl(false);
if (pControl!=NULL && pControl->GetWindow() != NULL)
+ {
if (IsVisible() && IsExpanded())
pControl->GetWindow()->Show();
else
pControl->GetWindow()->Hide();
+ }
}
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index 217535420063..ab313887840f 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -145,6 +145,7 @@ void TimerBasedTaskExecution::SetSelf (
IMPL_LINK(TimerBasedTaskExecution,TimerCallback, Timer*,EMPTYARG)
{
if (mpTask.get() != NULL)
+ {
if (mpTask->HasNextStep())
{
// Execute as many steps as fit into the time span of length
@@ -172,6 +173,7 @@ IMPL_LINK(TimerBasedTaskExecution,TimerCallback, Timer*,EMPTYARG)
}
else
mpSelf.reset();
+ }
return 0;
}
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 84831aa4dad6..269debd1a4a1 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -670,8 +670,8 @@ sal_Bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nSta
if(pDescr->IsWords())
{
- if( nStartPos > 0 && aText.getStr()[nStartPos-1] > ' ' ||
- nEndPos < aText.getLength() && aText.getStr()[nEndPos] > ' ')
+ if( (nStartPos > 0 && aText.getStr()[nStartPos-1] > ' ') ||
+ (nEndPos < aText.getLength() && aText.getStr()[nEndPos] > ' ') )
{
nStartPos++;
return Search( aText, nStartPos, nEndPos, pDescr );
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index d2df09612137..1532356c7f2a 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1235,6 +1235,7 @@ void Outliner::PrepareSpellCheck (void)
// When spell checking we have to test whether we have processed the
// whole document and have reached the start page again.
if (meMode == SPELL)
+ {
if (maSearchStartPosition == ::sd::outliner::Iterator())
// Remember the position of the first text object so that we
// know when we have processed the whole document.
@@ -1243,7 +1244,7 @@ void Outliner::PrepareSpellCheck (void)
{
mbEndOfSearch = true;
}
-
+ }
EnterEditMode( FALSE );
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 93fa3ca21602..82f182e88e03 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -647,7 +647,7 @@ BOOL View::IsPresObjSelected(BOOL bOnPage, BOOL bOnMasterPage, BOOL bCheckPresOb
pPage = (SdPage*) pObj->GetPage();
bMasterPage = pPage->IsMasterPage();
- if (bMasterPage && bOnMasterPage || !bMasterPage && bOnPage)
+ if ( (bMasterPage && bOnMasterPage) || (!bMasterPage && bOnPage) )
{
if ( pPage && pPage->IsPresObj(pObj) )
{
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 7fe228d5fc5f..6de0865217b3 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -922,6 +922,7 @@ void ViewShell::ArrangeGUIElements (void)
// Filler in the lower right corner.
if (mpScrollBarBox.get() != NULL)
+ {
if (mpHorizontalScrollBar.get()!=NULL
&& mpHorizontalScrollBar->IsVisible()
&& mpVerticalScrollBar.get()!=NULL
@@ -932,6 +933,7 @@ void ViewShell::ArrangeGUIElements (void)
}
else
mpScrollBarBox->Hide();
+ }
// Place horizontal ruler below tab bar.
if (mbHasRulers && mpContentWindow.get() != NULL)
generated by cgit (git 2.34.1) at 2024-08-01 17:55:02 +0000