summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/drviewsh.cxx6
-rw-r--r--sd/source/ui/view/outlnvsh.cxx20
-rw-r--r--sd/source/ui/view/outlview.cxx3
-rw-r--r--sd/source/ui/view/sdview.cxx4
-rw-r--r--sd/source/ui/view/sdview4.cxx11
-rw-r--r--sd/source/ui/view/viewshe2.cxx8
6 files changed, 18 insertions, 34 deletions
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index 8c043e3c0ae7f..a4a1e434cc6a1 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -41,17 +41,15 @@
namespace sd {
-bool DrawViewShell::GotoBookmark(const OUString& rBookmark)
+void DrawViewShell::GotoBookmark(const OUString& rBookmark)
{
- bool bRet = false;
::sd::DrawDocShell* pDocSh = GetDocSh();
if( pDocSh )
{
if( !pDocSh->GetViewShell() ) //#i26016# this case occurs if the jump-target-document was opened already with file open dialog before triggering the jump via hyperlink
pDocSh->Connect(this);
- bRet = (pDocSh->GotoBookmark(rBookmark));
+ pDocSh->GotoBookmark(rBookmark);
}
- return bRet;
}
/**
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 2391a02c46186..cdf4716098694 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1070,7 +1070,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
/**
* gets invoked when ScrollBar is used
*/
-long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
+void OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
{
long nThumb = pHScroll->GetThumbPos();
long nRange = pHScroll->GetRange().Len();
@@ -1089,11 +1089,9 @@ long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
pOutlinerView->HideCursor();
pOutlinerView->Scroll(-nDelta, 0);
pOutlinerView->ShowCursor(false);
-
- return 0;
}
-long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
+void OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
{
long nThumb = pVScroll->GetThumbPos();
long nRange = pVScroll->GetRange().Len();
@@ -1112,8 +1110,6 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
pOutlinerView->HideCursor();
pOutlinerView->Scroll(0, -nDelta);
pOutlinerView->ShowCursor(false);
-
- return 0;
}
/**
@@ -1577,13 +1573,13 @@ void OutlineViewShell::UpdatePreview( SdPage* pPage, bool )
}
}
-bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara )
+void OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara )
{
DBG_ASSERT( pPage, "sd::OutlineViewShell::UpdateTitleObject(), pPage == 0?" );
DBG_ASSERT( pPara, "sd::OutlineViewShell::UpdateTitleObject(), pPara == 0?" );
if( !pPage || !pPara )
- return false;
+ return;
::Outliner& rOutliner = pOlView->GetOutliner();
SdrTextObj* pTO = OutlineView::GetTitleTextObject( pPage );
@@ -1653,17 +1649,15 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara )
pPage->RemoveObject(pTO->GetOrdNum());
}
}
-
- return bNewObject;
}
-bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
+void OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
{
DBG_ASSERT( pPage, "sd::OutlineViewShell::UpdateOutlineObject(), pPage == 0?" );
DBG_ASSERT( pPara, "sd::OutlineViewShell::UpdateOutlineObject(), pPara == 0?" );
if( !pPage || !pPara )
- return false;
+ return;
::Outliner& rOutliner = pOlView->GetOutliner();
OutlinerParaObject* pOPO = nullptr;
@@ -1758,8 +1752,6 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara )
pPage->RemoveObject(pTO->GetOrdNum());
}
}
-
- return bNewObject;
}
/**
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 63c19ebfdcb62..ab3e8ecc22914 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1040,14 +1040,13 @@ bool OutlineView::SetAttributes(const SfxItemSet& rSet, bool )
/**
* Get attributes of the selected text
*/
-bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, bool ) const
+void OutlineView::GetAttributes( SfxItemSet& rTargetSet, bool ) const
{
OutlinerView* pOlView = GetViewByWindow(
mrOutlineViewShell.GetActiveWindow());
assert(pOlView && "keine OutlinerView gefunden");
rTargetSet.Put( pOlView->GetAttribs(), false );
- return true;
}
/** creates outliner model from draw model */
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index cff5e65d9a444..98c6615c4077d 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -518,9 +518,9 @@ bool View::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
return bOk;
}
-bool View::GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr ) const
+void View::GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr ) const
{
- return FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr );
+ FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr );
}
/**
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index f9e75e33b0696..ffda4fe522878 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -273,7 +273,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
return pNewGrafObj;
}
-SdrMediaObj* View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction,
+void View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction,
const Point& rPos, const Size& rSize,
bool const bLink )
{
@@ -287,14 +287,14 @@ SdrMediaObj* View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction,
uno::Reference<frame::XModel> const xModel(
GetDoc().GetObjectShell()->GetModel());
bool const bRet = ::avmedia::EmbedMedia(xModel, rMediaURL, realURL);
- if (!bRet) { return nullptr; }
+ if (!bRet) { return; }
}
- return InsertMediaObj( realURL, "application/vnd.sun.star.media", rAction, rPos, rSize );
+ InsertMediaObj( realURL, "application/vnd.sun.star.media", rAction, rPos, rSize );
}
#if HAVE_FEATURE_GLTF
-SdrMediaObj* View::Insert3DModelURL(
+void View::Insert3DModelURL(
const OUString& rModelURL, sal_Int8& rAction,
const Point& rPos, const Size& rSize,
bool const bLink )
@@ -309,14 +309,13 @@ SdrMediaObj* View::Insert3DModelURL(
uno::Reference<frame::XModel> const xModel(
GetDoc().GetObjectShell()->GetModel());
bool const bRet = ::avmedia::Embed3DModel(xModel, rModelURL, sRealURL);
- if (!bRet) { return nullptr; }
+ if (!bRet) { return; }
}
SdrMediaObj* pRetObject = InsertMediaObj( sRealURL, "model/vnd.gltf+json", rAction, rPos, rSize );
avmedia::MediaItem aItem = pRetObject->getMediaProperties();
aItem.setLoop(true);
pRetObject->setMediaProperties(aItem);
- return pRetObject;
}
#endif
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 628292f48d876..692262c698360 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -142,7 +142,7 @@ IMPL_LINK_TYPED(ViewShell, HScrollHdl, ScrollBar *, pHScroll, void )
/**
* virtual scroll handler for horizontal Scrollbars
*/
-long ViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
+void ViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
{
long nDelta = pHScroll->GetDelta();
@@ -183,8 +183,6 @@ long ViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
UpdateHRuler();
}
-
- return 0;
}
/**
@@ -198,7 +196,7 @@ IMPL_LINK_TYPED(ViewShell, VScrollHdl, ScrollBar *, pVScroll, void )
/**
* handling for vertical Scrollbars
*/
-long ViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
+void ViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
{
if(IsPageFlipMode())
{
@@ -244,8 +242,6 @@ long ViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
UpdateVRuler();
}
-
- return 0;
}
SvxRuler* ViewShell::CreateHRuler(::sd::Window* , bool )
generated by cgit (git 2.34.1) at 2025-05-15 04:03:21 +0000