diff options
26 files changed, 41 insertions, 41 deletions
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index cf399b1770b0..eda1f1a5c2de 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -167,7 +167,7 @@ namespace /* private */ { void write_xml_tag(const string_t& name, const string_t& value, const recently_used_file& file) const { - write_xml_start_tag(name, file); + write_xml_start_tag(name, file, false); OString escaped = escape_content (value); file.write(escaped.getStr(), escaped.getLength()); write_xml_end_tag(name, file); @@ -180,7 +180,7 @@ namespace /* private */ { file.write("/>\n", 3); } - void write_xml_start_tag(const string_t& name, const recently_used_file& file, bool linefeed = false) const + void write_xml_start_tag(const string_t& name, const recently_used_file& file, bool linefeed) const { file.write("<", 1); file.write(name.c_str(), name.length()); diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 02cf96d11b96..35845c2abd60 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -2028,7 +2028,7 @@ void GlitterTransition::finish( double, double, double, double, double ) std::shared_ptr<OGLTransitionImpl> makeGlitterTransition(const Primitives_t& rLeavingSlidePrimitives, const Primitives_t& rEnteringSlidePrimitives, - const TransitionSettings& rSettings = TransitionSettings()) + const TransitionSettings& rSettings) { return std::make_shared<GlitterTransition>(TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives), rSettings); @@ -2051,7 +2051,7 @@ std::shared_ptr<OGLTransitionImpl> makeGlitter() aSlide.push_back(aHexagon); - return makeGlitterTransition(aSlide, aEmptySlide); + return makeGlitterTransition(aSlide, aEmptySlide, TransitionSettings()); } namespace diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx index 5831fb2ed640..3f830428c6a8 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx @@ -44,7 +44,7 @@ AnimationActivitySharedPtr AnimationPathMotionNode::createActivity() const mxPathMotionNode->getAdditive(), getShape(), getContext().mpSubsettableShapeManager, - getSlideSize() ), + getSlideSize(), 0 ), true ); } diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index ee451ea2cb89..bc9c86462336 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -59,7 +59,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const rShape, getContext().mpSubsettableShapeManager, getSlideSize(), - nTransformType ), + nTransformType, 0 ), getXAnimateNode() ); case animations::AnimationTransformType::ROTATE: diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index 229e26dd5c7b..83f72a96b457 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -47,7 +47,7 @@ BaseContainerNode::BaseContainerNode( void BaseContainerNode::dispose() { - forEachChildNode( std::mem_fn(&Disposable::dispose) ); + forEachChildNode( std::mem_fn(&Disposable::dispose), -1 ); maChildren.clear(); BaseNode::dispose(); } diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx index cc65be6fdb85..b36f7f5aba03 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.hxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx @@ -70,7 +70,7 @@ protected: template <typename FuncT> inline void forEachChildNode( FuncT func, - int nodeStateMask = -1 ) const + int nodeStateMask ) const { VectorOfNodes::const_iterator iPos( maChildren.begin() ); VectorOfNodes::const_iterator const iEnd( maChildren.end() ); diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx index 68bf6497df9c..e768572ad7aa 100644 --- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx +++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx @@ -59,7 +59,7 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const attrName, pShape, getContext().mpSubsettableShapeManager, - getSlideSize() ), + getSlideSize(), 0 ), xAnimateNode ); case AnimationFactory::CLASS_COLOR_PROPERTY: @@ -79,7 +79,7 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const attrName, pShape, getContext().mpSubsettableShapeManager, - getSlideSize() ), + getSlideSize(), 0 ), xAnimateNode ); case AnimationFactory::CLASS_BOOL_PROPERTY: @@ -89,7 +89,7 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const attrName, pShape, getContext().mpSubsettableShapeManager, - getSlideSize() ), + getSlideSize(), 0 ), xAnimateNode ); } diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx index 4dc66f19c109..c7f8cd934582 100644 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx @@ -385,7 +385,7 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView ) aModifiedEntry->second->move( maSpriteRectangle.getMinimum() ); // sprites changed, need screen update - mrScreenUpdater.notifyUpdate( rView ); + mrScreenUpdater.notifyUpdate( rView, false ); } void RehearseTimingsActivity::viewsChanged() diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx index 29c0613b8068..1b9891339e5d 100644 --- a/slideshow/source/inc/animationfactory.hxx +++ b/slideshow/source/inc/animationfactory.hxx @@ -89,7 +89,7 @@ namespace slideshow const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags ); ColorAnimationSharedPtr createColorPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, @@ -108,26 +108,26 @@ namespace slideshow const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, sal_Int16 nTransformType, - int nFlags=0 ); + int nFlags ); StringAnimationSharedPtr createStringPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags ); BoolAnimationSharedPtr createBoolPropertyAnimation( const OUString& rAttrName, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags ); NumberAnimationSharedPtr createPathMotionAnimation( const OUString& rSVGDPath, sal_Int16 nAdditive, const AnimatableShapeSharedPtr& rShape, const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0); + int nFlags); } } } diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx index 4140ed4af725..dcf299b18586 100644 --- a/slideshow/source/inc/screenupdater.hxx +++ b/slideshow/source/inc/screenupdater.hxx @@ -71,7 +71,7 @@ namespace slideshow implementation 'thinks' it does not need to render something to screen. */ - void notifyUpdate( const UnoViewSharedPtr& rView, bool bViewClobbered=false ); + void notifyUpdate( const UnoViewSharedPtr& rView, bool bViewClobbered ); /** Commits collected update actions */ diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 421626363feb..ab256fd1a628 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -495,7 +495,7 @@ Storage::~Storage() if( pEntry->m_nRefCnt && pEntry->m_bDirect && (m_nMode & StreamMode::WRITE) ) Commit(); if( pEntry->m_nRefCnt == 1 ) - pEntry->Invalidate(); + pEntry->Invalidate(false); } // close the stream is root storage if( bIsRoot ) diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index dacd8909d586..a4c682df3855 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -760,7 +760,7 @@ StgDirStrm::~StgDirStrm() void StgDirStrm::SetupEntry( sal_Int32 n, StgDirEntry* pUpper ) { - void* p = ( n == STG_FREE ) ? nullptr : GetEntry( n ); + void* p = ( n == STG_FREE ) ? nullptr : GetEntry( n, false ); if( p ) { SvStream *pUnderlyingStream = m_rIo.GetStrm(); diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx index cecbba46fa89..794049ffa692 100644 --- a/sot/source/sdstor/stgdir.hxx +++ b/sot/source/sdstor/stgdir.hxx @@ -67,8 +67,8 @@ public: explicit StgDirEntry( const StgEntry& ); virtual ~StgDirEntry(); - void Invalidate( bool=false ); // invalidate all open entries - void Enum( sal_Int32& ); // enumerate entries for iteration + void Invalidate( bool ); // invalidate all open entries + void Enum( sal_Int32& ); // enumerate entries for iteration void DelTemp( bool ); // delete temporary entries bool Store( StgDirStrm& ); // save entry into dir strm bool IsContained( StgDirEntry* ); // check if subentry @@ -99,7 +99,7 @@ public: virtual ~StgDirStrm(); virtual bool SetSize( sal_Int32 ) override; // change the size bool Store(); - void* GetEntry( sal_Int32 n, bool=false );// get an entry + void* GetEntry( sal_Int32 n, bool );// get an entry StgDirEntry* GetRoot() { return m_pRoot; } StgDirEntry* Find( StgDirEntry&, const OUString& ); StgDirEntry* Create( StgDirEntry&, const OUString&, StgEntryType ); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 0a12fc8a935b..b61053976f73 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -507,7 +507,7 @@ public: bool Revert(); bool Insert( ::ucbhelper::Content *pContent ); UCBStorage_Impl* OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect ); - void OpenStream( UCBStorageElement_Impl*, StreamMode, bool, const OString* pKey=nullptr ); + void OpenStream( UCBStorageElement_Impl*, StreamMode, bool, const OString* pKey ); void SetProps( const Sequence < Sequence < PropertyValue > >& rSequence, const OUString& ); void GetProps( sal_Int32&, Sequence < Sequence < PropertyValue > >& rSequence, const OUString& ); sal_Int32 GetObjectCount(); @@ -1815,7 +1815,7 @@ void UCBStorage_Impl::ReadContent() else if ( aMediaType.isEmpty() ) { // older files didn't have that special content type, so they must be detected - OpenStream( pElement, STREAM_STD_READ, m_bDirect ); + OpenStream( pElement, STREAM_STD_READ, m_bDirect, nullptr ); if ( Storage::IsStorageFile( pElement->m_xStream ) ) pElement->m_bIsStorage = true; else diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 85d429323b91..084fae6b927b 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -80,7 +80,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper void SetScrollBarRanges(); void InitScrollBars(); void InvalidateSlots(); - void UpdateStatus(bool bSetDocModified = false); + void UpdateStatus(bool bSetDocModified); public: explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index a62f1ccefa72..3511d71f395a 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -200,7 +200,7 @@ public: /** True if this node is selected */ bool IsSelected() const {return mbIsSelected;} - void SetSelected(bool Selected = true) {mbIsSelected = Selected;} + void SetSelected(bool Selected) {mbIsSelected = Selected;} /** Get the parent node of this node */ SmStructureNode* GetParent(){ return mpParentNode; } diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index ccc903754bb5..287ddc48d440 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -320,7 +320,7 @@ public: * so that when text is inserted from catalog or elsewhere we know whether to * insert for the visual editor, or the text editor. */ - void SetInsertIntoEditWindow(bool bEditWindowHadFocusLast = true){ + void SetInsertIntoEditWindow(bool bEditWindowHadFocusLast){ bInsertIntoEditWindow = bEditWindowHadFocusLast; } bool IsInlineEditEnabled() const; diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 69ae86594e43..780966900cd5 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -253,7 +253,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) IMPL_LINK_NOARG_TYPED( SmEditWindow, ModifyTimerHdl, Idle *, void ) { - UpdateStatus(); + UpdateStatus(false); aModifyIdle.Stop(); } @@ -707,7 +707,7 @@ void SmEditWindow::GetFocus() //Let SmViewShell know we got focus if(GetView() && IsInlineEditEnabled()) - GetView()->SetInsertIntoEditWindow(); + GetView()->SetInsertIntoEditWindow(true); } diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 82a5bc832b19..f39843e825d6 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -574,7 +574,7 @@ bool MathType::Parse(SotStorage *pStor) if (nVersion > 3) // allow only supported versions of MathType to be parsed return false; - bool bRet = HandleRecords(); + bool bRet = HandleRecords(0); //little crude hack to close occasionally open expressions //a sophisticated system to determine what expressions are //opened is required, but this is as much work as rewriting @@ -1932,7 +1932,7 @@ bool MathType::ConvertFromStarMath( SfxMedium& rMedium ) sal_uInt32 nSize = pS->Tell(); nPendingAttributes=0; - HandleNodes(pTree); + HandleNodes(pTree, 0); pS->WriteUChar( END ); nSize = pS->Tell()-nSize; diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx index a47b43e4f453..1bf66020cc0a 100644 --- a/starmath/source/mathtype.hxx +++ b/starmath/source/mathtype.hxx @@ -122,7 +122,7 @@ private: void Init(); - bool HandleRecords(int nLevel =0, sal_uInt8 nSelector =0xFF, + bool HandleRecords(int nLevel, sal_uInt8 nSelector =0xFF, sal_uInt8 nVariation =0xFF, int nRows =0, int nCols =0); bool HandleSize(sal_Int16 nLSize, sal_Int16 nDSize, int &rSetSize); void HandleAlign(sal_uInt8 nHAlign, sal_uInt8 nVAlign, int &rSetAlign); @@ -142,7 +142,7 @@ private: static int xfEMBELL(sal_uInt8 nTest) {return nTest&0x20;} static int xfNULL(sal_uInt8 nTest) {return nTest&0x10;} - void HandleNodes(SmNode *pNode,int nLevel=0); + void HandleNodes(SmNode *pNode,int nLevel); int StartTemplate(sal_uInt16 nSelector,sal_uInt16 nVariation=0); void EndTemplate(int nOldPendingAttributes); void HandleSmMatrix(SmMatrixNode *pMatrix,int nLevel); @@ -195,7 +195,7 @@ private: }; public: static bool LookupChar(sal_Unicode nChar,OUString &rRet, - sal_uInt8 nVersion=3,sal_uInt8 nTypeFace=0); + sal_uInt8 nVersion,sal_uInt8 nTypeFace=0); }; diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 18143d5b9187..34c3480962bc 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2509,7 +2509,7 @@ void SmMathSymbolNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat) void SmMathSymbolNode::CreateTextFromNode(OUString &rText) { OUString sStr; - MathType::LookupChar(GetToken().cMathChar, sStr); + MathType::LookupChar(GetToken().cMathChar, sStr, 3); rText += sStr; } diff --git a/starmath/source/ooxmlexport.hxx b/starmath/source/ooxmlexport.hxx index 5899a49796cf..41cb6516efac 100644 --- a/starmath/source/ooxmlexport.hxx +++ b/starmath/source/ooxmlexport.hxx @@ -28,7 +28,7 @@ public: private: virtual void HandleVerticalStack( const SmNode* pNode, int nLevel ) override; virtual void HandleText( const SmNode* pNode, int nLevel ) override; - virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type = nullptr ) override; + virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type ) override; virtual void HandleRoot( const SmRootNode* pNode, int nLevel ) override; virtual void HandleAttribute( const SmAttributNode* pNode, int nLevel ) override; virtual void HandleOperator( const SmOperNode* pNode, int nLevel ) override; diff --git a/starmath/source/rtfexport.hxx b/starmath/source/rtfexport.hxx index 7071b9f74fa7..380fda80149b 100644 --- a/starmath/source/rtfexport.hxx +++ b/starmath/source/rtfexport.hxx @@ -25,7 +25,7 @@ public: private: virtual void HandleVerticalStack(const SmNode* pNode, int nLevel) override; virtual void HandleText(const SmNode* pNode, int nLevel) override; - virtual void HandleFractions(const SmNode* pNode, int nLevel, const char* type = nullptr) override; + virtual void HandleFractions(const SmNode* pNode, int nLevel, const char* type) override; virtual void HandleRoot(const SmRootNode* pNode, int nLevel) override; virtual void HandleAttribute(const SmAttributNode* pNode, int nLevel) override; virtual void HandleOperator(const SmOperNode* pNode, int nLevel) override; diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index c80ce63bebd5..7efec06a4937 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -688,7 +688,7 @@ void SmSetSelectionVisitor::Visit( SmTextNode* pNode ) { i2 = maEndPos.Index; long start, end; - pNode->SetSelected(); + pNode->SetSelected(true); if( i1 != -1 && i2 != -1 ) { start = i1 < i2 ? i1 : i2; //MIN end = i1 > i2 ? i1 : i2; //MAX diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx index 215a6c73769c..ea38df853755 100644 --- a/starmath/source/wordexportbase.cxx +++ b/starmath/source/wordexportbase.cxx @@ -46,7 +46,7 @@ void SmWordExportBase::HandleNode(const SmNode* pNode, int nLevel) HandleBinaryOperation(static_cast< const SmBinHorNode* >(pNode), nLevel); break; case NBINVER: - HandleFractions(pNode,nLevel); + HandleFractions(pNode,nLevel,nullptr); break; case NROOT: HandleRoot(static_cast< const SmRootNode* >(pNode), nLevel); diff --git a/starmath/source/wordexportbase.hxx b/starmath/source/wordexportbase.hxx index b8aac113334a..f40c261e9413 100644 --- a/starmath/source/wordexportbase.hxx +++ b/starmath/source/wordexportbase.hxx @@ -27,7 +27,7 @@ protected: virtual void HandleVerticalStack( const SmNode* pNode, int nLevel ) = 0; virtual void HandleText( const SmNode* pNode, int nLevel ) = 0; void HandleMath( const SmNode* pNode, int nLevel ); - virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type = nullptr ) = 0; + virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type ) = 0; void HandleUnaryOperation( const SmUnHorNode* pNode, int nLevel ); void HandleBinaryOperation( const SmBinHorNode* pNode, int nLevel ); virtual void HandleRoot( const SmRootNode* pNode, int nLevel ) = 0; |