diff options
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdpreslt.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/outlview.cxx | 3 |
5 files changed, 8 insertions, 9 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 9a0e7f0420f5..f51373cca0a4 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -200,7 +200,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year ); if (aDate==aSysDate) sRet = SdResId(STR_ANNOTATION_TODAY); - else if (aDate == Date(aSysDate-1)) + else if (aDate == (aSysDate-1)) sRet = SdResId(STR_ANNOTATION_YESTERDAY); else if (aDate.IsValidAndGregorian() ) sRet = rLocalData.getDate(aDate); diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index b7f7d3642671..280856096549 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -158,7 +158,7 @@ void SdPresLayoutDlg::FillValueSet() aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)); maLayoutNames.push_back(aLayoutName); - Image aBitmap(Bitmap(mpDocSh->GetPagePreviewBitmap(pMaster))); + Image aBitmap(mpDocSh->GetPagePreviewBitmap(pMaster)); m_pVS->InsertItem((sal_uInt16)maLayoutNames.size(), aBitmap, aLayoutName); } } @@ -256,7 +256,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void) aLayoutName = aLayoutName.copy(0, aLayoutName.indexOf(SD_LT_SEPARATOR)); maLayoutNames.push_back(aLayoutName); - Image aBitmap(Bitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster))); + Image aBitmap(pTemplDocSh->GetPagePreviewBitmap(pMaster)); m_pVS->InsertItem((sal_uInt16)maLayoutNames.size(), aBitmap, aLayoutName); } } diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index cf684596dbb6..098dab8c016e 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1741,7 +1741,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) { XFillColorItem aColorItem( static_cast<const XFillColorItem&>(pArgs->Get( XATTR_FILLCOLOR )) ); rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_SOLID ) ); - rPageProperties.PutItem( XFillColorItem( aColorItem )); + rPageProperties.PutItem( aColorItem ); } break; @@ -1763,7 +1763,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) { XFillHatchItem aHatchItem( static_cast<const XFillHatchItem&>(pArgs->Get( XATTR_FILLHATCH )) ); rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_HATCH ) ); - rPageProperties.PutItem( XFillHatchItem( aHatchItem )); + rPageProperties.PutItem( aHatchItem ); } break; @@ -1771,7 +1771,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) { XFillBitmapItem aBitmapItem( static_cast<const XFillBitmapItem&>(pArgs->Get( XATTR_FILLBITMAP )) ); rPageProperties.PutItem( XFillStyleItem( drawing::FillStyle_BITMAP ) ); - rPageProperties.PutItem( XFillBitmapItem( aBitmapItem )); + rPageProperties.PutItem( aBitmapItem ); } break; diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 39742f8b333b..b478e81354e0 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -276,7 +276,7 @@ void OutlineViewShell::ArrangeGUIElements () if (!aWin.IsEmpty()) // not when opening { - InitWindows(Point(0,0), aText.GetSize(), Point(aVis.TopLeft())); + InitWindows(Point(0,0), aText.GetSize(), aVis.TopLeft()); UpdateScrollBars(); } } diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index b76b852e7100..9627e99edc09 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -780,8 +780,7 @@ IMPL_LINK_NOARG(OutlineView, StatusEventHdl, EditStatus&, void) if (aWin.GetHeight() > aText.Bottom()) aText.Bottom() = aWin.GetHeight(); - mrOutlineViewShell.InitWindows(Point(0,0), aText.GetSize(), - Point(aVis.TopLeft())); + mrOutlineViewShell.InitWindows(Point(0,0), aText.GetSize(), aVis.TopLeft()); mrOutlineViewShell.UpdateScrollBars(); } } |