diff options
28 files changed, 65 insertions, 107 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index a2434fa5057b..5eeea8d78126 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -263,7 +263,7 @@ public: SAL_DLLPRIVATE void InsertBookmark(const std::vector<OUString> &rBookmarkList, std::vector<OUString> &rExchangeList, bool bLink, - bool bReplace, sal_uInt16 nPgPos, bool bNoDialogs, + bool bReplace, sal_uInt16 nPgPos, ::sd::DrawDocShell* pBookmarkDocSh, Point* pObjPos); diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx index 1a5b57ab0353..c88a490c2856 100644 --- a/sd/inc/sdfilter.hxx +++ b/sd/inc/sdfilter.hxx @@ -37,7 +37,7 @@ namespace osl { class Module; } class SdFilter { public: - SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ); + SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ); virtual ~SdFilter(); bool IsDraw() const { return mbIsDraw; } @@ -51,7 +51,6 @@ protected: ::sd::DrawDocShell& mrDocShell; SdDrawDocument& mrDocument; bool mbIsDraw : 1; - bool mbShowProgress : 1; #ifndef DISABLE_DYNLOADING static ::osl::Module* OpenLibrary( const OUString& rLibraryName ); #endif diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 58d80cdeb223..49bc9bfa56c1 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -283,7 +283,6 @@ void SdDrawDocument::InsertBookmark( bool bLink, // Insert bookmarks as links? bool bReplace, // Replace current default and notes pages? sal_uInt16 nInsertPos, // Insertion position of pages - bool bNoDialogs, // Don't show dialogs ::sd::DrawDocShell* pBookmarkDocSh, // If set, this is the source document Point* pObjPos) // Insertion position of objects { @@ -329,7 +328,7 @@ void SdDrawDocument::InsertBookmark( { // Insert all page bookmarks bOK = InsertBookmarkAsPage(rBookmarkList, &rExchangeList, bLink, bReplace, - nInsertPos, bNoDialogs, pBookmarkDocSh, true/*bCopy*/, true, false); + nInsertPos, false/*bNoDialogs*/, pBookmarkDocSh, true/*bCopy*/, true, false); } if ( bOK && !rBookmarkList.empty() ) diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index f6b5e1fd9cf9..e07a245f7667 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -49,7 +49,7 @@ extern "C" sal_uInt32 ImportCGM( OUString const &, Reference< XModel > const &, #endif SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : - SdFilter( rMedium, rDocShell, true/*bShowProgress*/ ) + SdFilter( rMedium, rDocShell ) { } diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 5a030e2b9a53..f6c6ca11f36d 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -123,7 +123,7 @@ void SdGRFFilter_ImplInteractionHdl::handle( const css::uno::Reference< css::tas SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : - SdFilter( rMedium, rDocShell, true ) + SdFilter( rMedium, rDocShell ) { } diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index 56c74335e676..ac59c38f6a59 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -40,7 +40,7 @@ SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : - SdFilter( rMedium, rDocShell, true/*bShowProgress*/ ) + SdFilter( rMedium, rDocShell ) { } diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 990691d10af7..558d443a2055 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -41,13 +41,12 @@ using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) +SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : mxModel( rDocShell.GetModel() ) , mrMedium( rMedium ) , mrDocShell( rDocShell ) , mrDocument( *rDocShell.GetDoc() ) , mbIsDraw( rDocShell.GetDocumentType() == DOCUMENT_TYPE_DRAW ) -, mbShowProgress( bShowProgress ) { } diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 6f6b2254794f..049d3dad0af1 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -62,7 +62,7 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& ); SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : - SdFilter( rMedium, rDocShell, true/*bShowProgress*/ ), + SdFilter( rMedium, rDocShell ), pBas ( nullptr ) { } @@ -161,8 +161,7 @@ bool SdPPTFilter::Export() mrDocument.SetSwapGraphicsMode( SdrSwapGraphicsMode::TEMP ); - if( mbShowProgress ) - CreateStatusIndicator(); + CreateStatusIndicator(); //OUString sBaseURI( "BaseURI"); std::vector< PropertyValue > aProperties; diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 8416ca56f8bd..7d9fbf74012a 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -158,7 +158,7 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) : - SdFilter( rMedium, rDocShell, true/*bShowProgress*/ ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer ) + SdFilter( rMedium, rDocShell ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer ) { } @@ -528,7 +528,6 @@ bool SdXMLFilter::Import( ErrCode& nError ) Reference< lang::XComponent > xModelComp( mxModel, uno::UNO_QUERY ); // try to get an XStatusIndicator from the Medium - if( mbShowProgress ) { SfxItemSet* pSet = mrMedium.GetItemSet(); if(pSet) @@ -910,26 +909,23 @@ bool SdXMLFilter::Export() xGrfResolver = pGraphicHelper; } - if(mbShowProgress) + CreateStatusIndicator(); + if(mxStatusIndicator.is()) { - CreateStatusIndicator(); - if(mxStatusIndicator.is()) - { - sal_Int32 nProgressRange(1000000); - sal_Int32 nProgressCurrent(0); - OUString aMsg(SD_RESSTR(STR_SAVE_DOC)); - mxStatusIndicator->start(aMsg, nProgressRange); - - // set ProgressRange - uno::Any aProgRange; - aProgRange <<= nProgressRange; - xInfoSet->setPropertyValue( "ProgressRange" , aProgRange); - - // set ProgressCurrent - uno::Any aProgCurrent; - aProgCurrent <<= nProgressCurrent; - xInfoSet->setPropertyValue( "ProgressCurrent" , aProgCurrent); - } + sal_Int32 nProgressRange(1000000); + sal_Int32 nProgressCurrent(0); + OUString aMsg(SD_RESSTR(STR_SAVE_DOC)); + mxStatusIndicator->start(aMsg, nProgressRange); + + // set ProgressRange + uno::Any aProgRange; + aProgRange <<= nProgressRange; + xInfoSet->setPropertyValue( "ProgressRange" , aProgRange); + + // set ProgressCurrent + uno::Any aProgCurrent; + aProgCurrent <<= nProgressCurrent; + xInfoSet->setPropertyValue( "ProgressCurrent" , aProgCurrent); } uno::Reference< lang::XComponent > xComponent( mxModel, uno::UNO_QUERY ); @@ -1019,11 +1015,8 @@ bool SdXMLFilter::Export() } while( bDocRet && pServices->mpService ); - if(mbShowProgress) - { - if(mxStatusIndicator.is()) - mxStatusIndicator->end(); - } + if(mxStatusIndicator.is()) + mxStatusIndicator->end(); } } catch (const uno::Exception &e) diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx index ea339af5eb33..dd4a112e2eb1 100644 --- a/sd/source/ui/animations/STLPropertySet.cxx +++ b/sd/source/ui/animations/STLPropertySet.cxx @@ -38,7 +38,7 @@ STLPropertySet::~STLPropertySet() void STLPropertySet::setPropertyDefaultValue( sal_Int32 nHandle, const Any& rValue ) { - STLPropertyMapEntry aEntry( rValue, STLPropertyState_DEFAULT ); + STLPropertyMapEntry aEntry( rValue ); maPropertyMap[ nHandle ] = aEntry; } diff --git a/sd/source/ui/animations/STLPropertySet.hxx b/sd/source/ui/animations/STLPropertySet.hxx index 54665cc781d8..058e36ef8e3e 100644 --- a/sd/source/ui/animations/STLPropertySet.hxx +++ b/sd/source/ui/animations/STLPropertySet.hxx @@ -39,8 +39,8 @@ struct STLPropertyMapEntry STLPropertyMapEntry() : mnState( STLPropertyState_AMBIGUOUS ) {} - STLPropertyMapEntry( css::uno::Any aValue, sal_Int32 nState = STLPropertyState_DEFAULT ) - : maValue( aValue ), mnState( nState ) {} + STLPropertyMapEntry( css::uno::Any aValue ) + : maValue( aValue ), mnState( STLPropertyState_DEFAULT ) {} }; diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index c80cf870690b..6bca731498c5 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -917,8 +917,8 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, bool bUseConfig ) : - SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ? +SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId ) : + SdOptionsGeneric( nConfigId, ( SDCFG_DRAW == nConfigId ) ? OUString( "Office.Draw/Zoom" ) : OUString() ), nX( 1 ), @@ -970,12 +970,12 @@ bool SdOptionsZoom::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, bool bUseConfig ) : - SdOptionsGeneric( nConfigId, bUseConfig ? - ( ( SDCFG_DRAW == nConfigId ) ? +SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId ) : + SdOptionsGeneric( nConfigId, + ( SDCFG_DRAW == nConfigId ) ? OUString( "Office.Draw/Grid" ) : - OUString( "Office.Impress/Grid" ) ) : - OUString() ) + OUString( "Office.Impress/Grid" ) + ) { EnableModify( false ); SetDefaults(); @@ -1399,8 +1399,8 @@ SdOptions::SdOptions( sal_uInt16 nConfigId ) : SdOptionsContents( nConfigId, true ), SdOptionsMisc( nConfigId, true ), SdOptionsSnap( nConfigId, true ), - SdOptionsZoom( nConfigId, true ), - SdOptionsGrid( nConfigId, true ), + SdOptionsZoom( nConfigId ), + SdOptionsGrid( nConfigId ), SdOptionsPrint( nConfigId, true ) { } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index b35a43f6af29..c26054da4f0b 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -817,7 +817,7 @@ void FuInsert3DModel::DoExecute( SfxRequest& ) aPos.Y() -= aSize.Height() >> 1; } - mpView->Insert3DModelURL( sURL, nAction, aPos, aSize, false ) ; + mpView->Insert3DModelURL( sURL, nAction, aPos, aSize ) ; if( mpWindow ) mpWindow->LeaveWait(); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 7450a3a1c96f..b5d724b1e319 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -390,7 +390,7 @@ protected: void DeleteActualPage(); void DeleteActualLayer(); - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst) override; + virtual SvxRuler* CreateHRuler(::sd::Window* pWin) override; virtual SvxRuler* CreateVRuler(::sd::Window* pWin) override; virtual void UpdateHRuler() override; virtual void UpdateVRuler() override; diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index cd414dc0911e..0f7a481e5989 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -53,7 +53,7 @@ public: virtual void Resize() override; protected: - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst) override; + virtual SvxRuler* CreateHRuler(::sd::Window* pWin) override; virtual SvxRuler* CreateVRuler(::sd::Window* pWin) override; private: diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index dc4893a7f30e..17e6fe6e2005 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -142,18 +142,14 @@ public: bool InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rInsertPos, ImageMap* pImageMap, bool bOptimize ); - SdrGrafObj* InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, const Point& rPos, SdrObject* pSelectedObj, ImageMap* pImageMap ); void InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize, bool const bLink ); - void Insert3DModelURL( const OUString& rModelURL, sal_Int8& rAction, - const Point& rPos, const Size& rSize, - bool const bLink ); - + const Point& rPos, const Size& rSize ); SdrMediaObj* InsertMediaObj( const OUString& rURL, const OUString& rMimeType, sal_Int8& rAction, const Point& rPos, const Size& rSize ); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index e4e2ad46c80d..ff51ab593d70 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -513,7 +513,7 @@ protected: virtual void VirtVScrollHdl(ScrollBar* pVScroll); // virtual functions ruler handling - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index e01e9556464e..c0bf17a9f9d9 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -420,7 +420,7 @@ protected: public: - SdOptionsZoom( sal_uInt16 nConfigId, bool bUseConfig ); + SdOptionsZoom( sal_uInt16 nConfigId ); virtual ~SdOptionsZoom() {} void GetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX; rY = nY; } @@ -437,7 +437,7 @@ protected: public: - SdOptionsGrid( sal_uInt16 nConfigId, bool bUseConfig ); + SdOptionsGrid( sal_uInt16 nConfigId ); virtual ~SdOptionsGrid(); void SetDefaults(); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 0d8e8bc01a7f..29b1b00cba96 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -498,21 +498,16 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) * Generate horizontal ruler */ -SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, bool bIsFirst) +SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin) { Ruler* pRuler; WinBits aWBits; SvxRulerSupportFlags nFlags = SvxRulerSupportFlags::OBJECT; - if ( bIsFirst ) - { - aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER | WB_EXTRAFIELD; - nFlags |= ( SvxRulerSupportFlags::SET_NULLOFFSET | - SvxRulerSupportFlags::TABS | - SvxRulerSupportFlags::PARAGRAPH_MARGINS ); // Neu - } - else - aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER; + aWBits = WB_HSCROLL | WB_3DLOOK | WB_BORDER | WB_EXTRAFIELD; + nFlags |= SvxRulerSupportFlags::SET_NULLOFFSET | + SvxRulerSupportFlags::TABS | + SvxRulerSupportFlags::PARAGRAPH_MARGINS; // Neu pRuler = VclPtr<Ruler>::Create(*this, GetParentWindow(), pWin, nFlags, GetViewFrame()->GetBindings(), aWBits); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index f96fad57f419..d673e06c3410 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -107,7 +107,7 @@ void PresentationViewShell::FinishInitialization( FrameView* pFrameView ) GetActiveWindow()->GrabFocus(); } -SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, bool) +SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*) { return nullptr; } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 4cc7c56ca93b..ce67bfe644da 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -843,7 +843,7 @@ IMPL_LINK_TYPED( View, ExecuteNavigatorDrop, void*, p, void ) if( bNameOK ) { mrDoc.InsertBookmark( aBookmarkList, aExchangeList, - bLink, bReplace, nPgPos, false, + bLink, bReplace, nPgPos, &pPageObjsTransferable->GetDocShell(), &aPos ); } diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index c13639fb8e16..d68de3a92830 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -296,21 +296,14 @@ void View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, #if HAVE_FEATURE_GLTF void View::Insert3DModelURL( const OUString& rModelURL, sal_Int8& rAction, - const Point& rPos, const Size& rSize, - bool const bLink ) + const Point& rPos, const Size& rSize ) { OUString sRealURL; - if (bLink) - { - sRealURL = rModelURL; - } - else - { - uno::Reference<frame::XModel> const xModel( + uno::Reference<frame::XModel> const xModel( GetDoc().GetObjectShell()->GetModel()); - bool const bRet = ::avmedia::Embed3DModel(xModel, rModelURL, sRealURL); - if (!bRet) { return; } - } + bool const bRet = ::avmedia::Embed3DModel(xModel, rModelURL, sRealURL); + if (!bRet) + return; SdrMediaObj* pRetObject = InsertMediaObj( sRealURL, "model/vnd.gltf+json", rAction, rPos, rSize ); avmedia::MediaItem aItem = pRetObject->getMediaProperties(); diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 8e8aeab739eb..c4b9f5758e16 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -244,7 +244,7 @@ void ViewShell::VirtVScrollHdl(ScrollBar* pVScroll) } } -SvxRuler* ViewShell::CreateHRuler(::sd::Window* , bool ) +SvxRuler* ViewShell::CreateHRuler(::sd::Window* ) { return nullptr; } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 9e2889c93e07..e7543a0ff0f5 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -849,7 +849,7 @@ void ViewShell::SetupRulers() } if ( mpHorizontalRuler.get() == nullptr ) { - mpHorizontalRuler.reset(CreateHRuler(GetActiveWindow(), true)); + mpHorizontalRuler.reset(CreateHRuler(GetActiveWindow())); if ( mpHorizontalRuler.get() != nullptr ) { mpHorizontalRuler->SetWinPos(nHRulerOfs); diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index e3bcb216d939..0b25fcc74268 100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -51,14 +51,13 @@ namespace pdfi bool isBold_, bool isItalic_, bool isUnderline_, - bool isOutline_, double size_, double ascent_) : familyName(familyName_), isBold(isBold_), isItalic(isItalic_), isUnderline(isUnderline_), - isOutline(isOutline_), + isOutline(false), size(size_), ascent(ascent_) {} @@ -73,7 +72,7 @@ namespace pdfi ascent(1.0) {} - OUString familyName; + OUString familyName; bool isBold; bool isItalic; bool isUnderline; diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index e536a8017c1f..06a97635bee3 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -610,7 +610,6 @@ void Parser::readFont() nIsBold != 0, nIsItalic != 0, nIsUnderline != 0, - false, nSize, 1.0); diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 758a3d68b9b6..d7312955a28a 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -186,16 +186,7 @@ void PresenterScrollBar::SetThumbPosition ( double nPosition, const bool bAsynchronousUpdate) { - SetThumbPosition(nPosition, bAsynchronousUpdate, true); -} - -void PresenterScrollBar::SetThumbPosition ( - double nPosition, - const bool bAsynchronousUpdate, - const bool bValidate) -{ - if (bValidate) - nPosition = ValidateThumbPosition(nPosition); + nPosition = ValidateThumbPosition(nPosition); if (nPosition != mnThumbPosition && ! mbIsNotificationActive) { @@ -442,7 +433,7 @@ void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEve UpdateDragAnchor(nDragDistance); if (nDragDistance != 0) { - SetThumbPosition(mnThumbPosition + nDragDistance, false, true); + SetThumbPosition(mnThumbPosition + nDragDistance, false); } } diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index aaf5f160bd60..b44de88bd47d 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -225,10 +225,6 @@ protected: const Area eArea) const; bool IsDisabled (const Area eArea) const; double ValidateThumbPosition (double nPosition); - void SetThumbPosition ( - double nPosition, - const bool bAsynchronousRepaint, - const bool bValidate); private: class MousePressRepeater; |