diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
commit | eceaaf89d03f6fd4cdb65ca3af37a4c578ca7240 (patch) | |
tree | 961b5dc2b23e1565f3cde7dd2820e4db78f0e85b /sd/source | |
parent | aa6681f0eeb437c32313766dfb8fd6b3f4c01b48 (diff) |
CWS-TOOLING: integrate CWS cmcfixes50
2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc r263311 :
Diffstat (limited to 'sd/source')
-rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdpreslt.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fusel.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unovwcrs.cxx | 32 | ||||
-rw-r--r-- | sd/source/ui/view/drviews4.cxx | 2 |
6 files changed, 20 insertions, 21 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 50db1d07cd44..0c05c58312b8 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -569,7 +569,7 @@ IMPL_LINK( AnimationWindow, ModifyTimeHdl, void *, EMPTYARG ) ULONG nPos = static_cast<ULONG>(aNumFldBitmap.GetValue() - 1); Time* pTime = static_cast< Time* >( aTimeList.GetObject( nPos ) ); - DBG_ASSERT( pTime, "Zeit nicht gefunden!" ) + DBG_ASSERT( pTime, "Zeit nicht gefunden!" ); *pTime = aTimeField.GetTime(); diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 3046fda844d9..b57474906567 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -141,7 +141,7 @@ void SdPresLayoutDlg::Reset() if (*((String*)mpLayoutNames->GetObject(nName)) == maName) break; } - DBG_ASSERT(nName < mnLayoutCount, "Layout nicht gefunden") + DBG_ASSERT(nName < mnLayoutCount, "Layout nicht gefunden"); maVS.SelectItem((USHORT)nName + 1); // Inizes des ValueSets beginnen bei 1 diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index cf6d253ca552..3f3817567ec4 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -144,7 +144,6 @@ void FuSelection::DoExecute( SfxRequest& rReq ) FuSelection::~FuSelection() { - HPUX_DTOR_BUG; mpView->UnmarkAllPoints(); mpView->ResetCreationActive(); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index d02556d8e790..fadfb3ebbcdd 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2717,7 +2717,7 @@ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawP SdPage* pPage = dynamic_cast< SdPage* > (pSdPage->GetSdrPage()); - DBG_ASSERT( pPage && pPage->IsMasterPage(), "SdMasterPage is not masterpage?") + DBG_ASSERT( pPage && pPage->IsMasterPage(), "SdMasterPage is not masterpage?"); if( !pPage || !pPage->IsMasterPage() || (mpModel->mpDoc->GetMasterPageUserCount(pPage) > 0)) return; //Todo: this should be excepted diff --git a/sd/source/ui/unoidl/unovwcrs.cxx b/sd/source/ui/unoidl/unovwcrs.cxx index f219f1e0b78b..3fc4b0a99c5b 100644 --- a/sd/source/ui/unoidl/unovwcrs.cxx +++ b/sd/source/ui/unoidl/unovwcrs.cxx @@ -109,63 +109,63 @@ SdXTextViewCursor::~SdXTextViewCursor() throw() sal_Bool SdXTextViewCursor::isVisible(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return sal_True; } void SdXTextViewCursor::setVisible(sal_Bool ) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } awt::Point SdXTextViewCursor::getPosition(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return awt::Point(); } void SdXTextViewCursor::collapseToStart(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } void SdXTextViewCursor::collapseToEnd(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } sal_Bool SdXTextViewCursor::isCollapsed(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return sal_True; } sal_Bool SdXTextViewCursor::goLeft(sal_Int16 , sal_Bool ) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return sal_False; } sal_Bool SdXTextViewCursor::goRight(sal_Int16, sal_Bool ) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return sal_False; } void SdXTextViewCursor::gotoRange(const uno::Reference< text::XTextRange > &, sal_Bool ) throw (::com::sun::star::uno::RuntimeException) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } void SdXTextViewCursor::gotoStart(sal_Bool ) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } void SdXTextViewCursor::gotoEnd(sal_Bool ) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } sal_Bool SdXTextViewCursor::screenDown(void) throw( uno::RuntimeException ) @@ -182,31 +182,31 @@ sal_Bool SdXTextViewCursor::screenUp(void) throw( uno::RuntimeException ) uno::Reference< text::XText > SdXTextViewCursor::getText(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return uno::Reference< text::XText > (); } uno::Reference< text::XTextRange > SdXTextViewCursor::getStart(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return uno::Reference< text::XTextRange > (); } uno::Reference< text::XTextRange > SdXTextViewCursor::getEnd(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return uno::Reference< text::XTextRange > (); } OUString SdXTextViewCursor::getString(void) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); return OUString(); } void SdXTextViewCursor::setString(const OUString& ) throw( uno::RuntimeException ) { - DBG_WARNING("not implemented") + DBG_WARNING("not implemented"); } diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index d7f8c0ff0159..83f896e3d5ad 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -920,7 +920,7 @@ void DrawViewShell::LockInput() void DrawViewShell::UnlockInput() { - DBG_ASSERT( mnLockCount, "Input for this shell is not locked!" ) + DBG_ASSERT( mnLockCount, "Input for this shell is not locked!" ); if ( mnLockCount ) mnLockCount--; } |