diff options
51 files changed, 98 insertions, 98 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 394259d9e446..c61574cc0277 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -5366,7 +5366,7 @@ void Test::testImportStream() ScImportExport aObj(m_pDoc, ScAddress(0,0,0)); aObj.SetImportBroadcast(true); aObj.SetExtOptions(aOpt); - aObj.ImportString("1,2,3"); + aObj.ImportString("1,2,3", SotClipboardFormatId::STRING); CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(0,0,0))); CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(ScAddress(1,0,0))); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 62efa6ce93a9..543bc7e95abc 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3198,7 +3198,7 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false EnterHandler(); if (pActiveViewSh) - pActiveViewSh->FindNextUnprot( bShift ); + pActiveViewSh->FindNextUnprot( bShift, true ); return true; } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index c1dc616f43dd..ac5ddec2e46a 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1431,7 +1431,7 @@ void ScModule::InputChanged( EditView* pView ) { ScInputHandler* pHdl = GetInputHdl(); if (pHdl) - pHdl->InputChanged( pView ); + pHdl->InputChanged( pView, false ); } void ScModule::ViewShellGone( ScTabViewShell* pViewSh ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 9952af2ef15a..43c8cbe6ef1d 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -564,7 +564,7 @@ void ScTPValidationValue::RemoveRefDlg() { if( ScValidationDlg *pValidationDlg = GetValidationDlg() ) { - if( pValidationDlg->RemoveRefDlg() ) + if( pValidationDlg->RemoveRefDlg(true) ) { pValidationDlg->SetHandler( nullptr ); pValidationDlg->SetSetRefHdl( nullptr ); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 84b80ac77f25..175059a09ada 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1202,7 +1202,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) { pInStream->SetStreamCharSet( aOptions.GetCharSet() ); pInStream->Seek( 0 ); - bRet = aImpEx.ImportStream( *pInStream, rMedium.GetBaseURL() ); + bRet = aImpEx.ImportStream( *pInStream, rMedium.GetBaseURL(), SotClipboardFormatId::STRING ); eError = bRet ? eERR_OK : SCERR_IMPORT_CONNECT; aDocument.StartAllListeners(); sc::SetFormulaDirtyContext aCxt; diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 0ba02ab5f085..2667ca854c39 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -43,7 +43,7 @@ public: void autoReplaceRange(const OUString& aVariable, const ScRange& rRange); void autoReplaceAddress(const OUString& aVariable, ScAddress const & aAddress); - void autoReplaceUses3D(bool bUse3D = true) { mbUse3D = bUse3D; } + void autoReplaceUses3D(bool bUse3D) { mbUse3D = bUse3D; } void applyRange(const OUString& aVariable, const ScRange& aRange, bool b3D = true); void applyRangeList(const OUString& aVariable, const ScRangeList& aRangeList); diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 99280f31eeb6..ecc01cfc2fbc 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -118,15 +118,15 @@ public: /** Returns the selected object, if it is the caption object of a cell note. @param ppCaptData (out-param) If not null, returns the pointer to the caption object data. */ - SdrObject* GetMarkedNoteCaption( ScDrawObjData** ppCaptData = nullptr ); + SdrObject* GetMarkedNoteCaption( ScDrawObjData** ppCaptData ); /** Locks/unlocks the specified layer in the draw page. Unlocked layer is required to be able to edit the contained objects. */ - void LockCalcLayer( SdrLayerID nLayer, bool bLock = true ); + void LockCalcLayer( SdrLayerID nLayer, bool bLock ); /** Locks/unlocks the background layer that contains background objects. Unlocked layer is required to be able to edit the objects. */ - inline void LockBackgroundLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_BACK, bLock ); } + inline void LockBackgroundLayer( bool bLock ) { LockCalcLayer( SC_LAYER_BACK, bLock ); } /** Unlocks the background layer that contains background objects. */ inline void UnlockBackgroundLayer() { LockBackgroundLayer( false ); } diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 79a2971891f2..161f159f4290 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -264,11 +264,11 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou bool IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow ); - bool HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex = nullptr, - SCsCOL* pAddX = nullptr, SCsROW* pAddY = nullptr ); + bool HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, + SCsCOL* pAddX, SCsROW* pAddY ); - sal_uInt16 HitPageBreak( const Point& rMouse, ScRange* pSource = nullptr, - SCCOLROW* pBreak = nullptr, SCCOLROW* pPrev = nullptr ); + sal_uInt16 HitPageBreak( const Point& rMouse, ScRange* pSource, + SCCOLROW* pBreak, SCCOLROW* pPrev ); /** The cell may be covered by text that overflows from a previous cell. @@ -368,7 +368,7 @@ public: using Window::Draw; void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, - ScUpdateMode eMode = SC_UPDATE_ALL ); + ScUpdateMode eMode ); /// Draw content of the gridwindow; shared between the desktop and the tiled rendering. void DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableInfo, ScOutputData& aOutputData, bool bLogicText, ScUpdateMode eMode); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index ba06e4fd1b64..b0be3efd67e9 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -119,12 +119,12 @@ public: void SetStreamPath( const OUString& rPath ) { aStreamPath = rPath; } - bool ImportString( const OUString&, SotClipboardFormatId=SotClipboardFormatId::STRING ); - bool ExportString( OUString&, SotClipboardFormatId=SotClipboardFormatId::STRING ); - bool ExportByteString( OString&, rtl_TextEncoding, SotClipboardFormatId=SotClipboardFormatId::STRING ); + bool ImportString( const OUString&, SotClipboardFormatId ); + bool ExportString( OUString&, SotClipboardFormatId ); + bool ExportByteString( OString&, rtl_TextEncoding, SotClipboardFormatId ); - bool ImportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); - bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); + bool ImportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId ); + bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId ); static bool ImportData( const OUString& rMimeType, const css::uno::Any & rValue ); diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 562955b9e4af..7ea15d724a15 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -180,7 +180,7 @@ public: bool GetTextAndFields( ScEditEngineDefaulter& rDestEngine ); - bool KeyInput( const KeyEvent& rKEvt, bool bStartEdit = false ); + bool KeyInput( const KeyEvent& rKEvt, bool bStartEdit ); void EnterHandler( ScEnterMode nBlockMode = ScEnterMode::NORMAL ); void CancelHandler(); void SetReference( const ScRange& rRef, ScDocument* pDoc ); @@ -192,7 +192,7 @@ public: void ClearText(); void InputSelection( EditView* pView ); - void InputChanged( EditView* pView, bool bFromNotify = false ); + void InputChanged( EditView* pView, bool bFromNotify ); void ViewShellGone(ScTabViewShell* pViewSh); void SetRefViewShell(ScTabViewShell* pRefVsh) {pRefViewSh=pRefVsh;} diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 4930da17fe57..f5a8c258d11e 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -236,7 +236,7 @@ public: void SetOkCancelMode(); void SetSumAssignMode(); - void EnableButtons( bool bEnable = true ); + void EnableButtons( bool bEnable ); void SetFormulaMode( bool bSet ); diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 8b164c052ea3..53638b133a1d 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -93,7 +93,7 @@ private: static ScPasteFunc nPreviousFormulaChecks; static sal_uInt16 nPreviousMoveMode; // enum InsCellCmd - void DisableChecks( bool bInsAllChecked = true ); + void DisableChecks( bool bInsAllChecked ); void TestModes(); // Handler diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index ffa2548d0a18..1864ef1991a0 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -51,8 +51,8 @@ public: bool GetTablesFromFile() const { return m_pBtnFromFile->IsChecked(); } bool GetTablesAsLink() const { return m_pBtnLink->IsChecked(); } - const OUString* GetFirstTable( sal_uInt16* pN = nullptr ); - const OUString* GetNextTable( sal_uInt16* pN = nullptr ); + const OUString* GetFirstTable( sal_uInt16* pN ); + const OUString* GetNextTable( sal_uInt16* pN ); ScDocShell* GetDocShellTables() { return pDocShTables; } bool IsTableBefore() const { return m_pBtnBefore->IsChecked(); } SCTAB GetTableCount() const { return nTableCount;} diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index d6fb4fd0f5a2..98941d95673d 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -40,7 +40,7 @@ public: bool GetRenameTable () const { return bRenameTable; } void GetTabNameString( OUString& rString ) const; void SetForceCopyTable (); - void EnableRenameTable (bool bFlag=true); + void EnableRenameTable (bool bFlag); private: void ResetRenameInput(); diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index aa7e5af437f1..8909fb36d22e 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -76,7 +76,7 @@ public: void setInitListener( InitListener* pListener ); - void addEntry( const ScRangeNameLine& rLine, bool bSetCurEntry = true ); + void addEntry( const ScRangeNameLine& rLine, bool bSetCurEntry ); void DeleteSelectedEntries(); void SetEntry( const ScRangeNameLine& rLine ); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 833d6d7bf569..04bbb1ff967d 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -275,12 +275,12 @@ private: void UpdateColumn ( const SCCOL* pCol = nullptr ); void UpdateRow ( const SCROW* pRow = nullptr ); - void UpdateTable ( const SCTAB* pTab = nullptr ); + void UpdateTable ( const SCTAB* pTab ); void UpdateAll (); - void GetDocNames(const OUString* pSelEntry = nullptr); + void GetDocNames(const OUString* pSelEntry); - void SetListMode ( NavListMode eMode, bool bSetSize = true ); + void SetListMode ( NavListMode eMode, bool bSetSize ); void ShowList ( bool bShow, bool bSetSize ); void ShowScenarios ( bool bSetSize ); diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 73434b4cfcfa..f5d47f6e9893 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -286,9 +286,9 @@ public: void SetSingleGrid( bool bNewMode ); void SetGridColor( const Color& rColor ); void SetMarkClipped( bool bSet ); - void SetShowNullValues ( bool bSet = true ); - void SetShowFormulas ( bool bSet = true ); - void SetShowSpellErrors( bool bSet = true ); + void SetShowNullValues ( bool bSet ); + void SetShowFormulas ( bool bSet ); + void SetShowSpellErrors( bool bSet ); void SetMirrorWidth( long nNew ); long GetScrW() const { return nScrW; } long GetScrH() const { return nScrH; } diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 920880e37030..c849e74eadf2 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -122,7 +122,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - SC_DLLPUBLIC void DataChanged(bool bNewTime = false); // Instead of calling Invalidate + SC_DLLPUBLIC void DataChanged(bool bNewTime); // Instead of calling Invalidate void DoInvalidate(); void SetXOffset( long nX ); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 59f10257c805..2d9d6c4cbdcc 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -91,7 +91,7 @@ public: void InitStartTable(SCTAB nTab); void UpdateScrollBars(); - void UpdateNeededScrollBars(bool bFromZoom = false); + void UpdateNeededScrollBars(bool bFromZoom); bool ScrollCommand( const CommandEvent& rCEvt ); void Execute( SfxRequest& rReq ); diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index b2c1a4751e3d..f24cda785efb 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -49,7 +49,7 @@ public: private: void Init(); - void EnableOptionalWidgets(bool bEnable = true); + void EnableOptionalWidgets(bool bEnable); VclPtr<CheckBox> m_pBtnProtect; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index a5b2f8c7d681..d57224709fcb 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -90,7 +90,7 @@ private: private: void InitPreDefinedList(); - void ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling = false); + void ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling); void InsertToDefinedList(); void RemoveFromDefinedList(); void SetSelectDefinedList(); diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index c068063a80f3..af7393ba6e84 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -216,7 +216,7 @@ protected: bool IsDrawTextEdit() const; void DrawEnableAnim(bool bSet); - void MakeDrawView( TriState nForceDesignMode = TRISTATE_INDET ); + void MakeDrawView( TriState nForceDesignMode ); void HideNoteMarker(); @@ -384,10 +384,10 @@ public: bool MoveCursorKeyInput( const KeyEvent& rKeyEvent ); - void FindNextUnprot( bool bShift, bool bInSelection = true ); + void FindNextUnprot( bool bShift, bool bInSelection ); SC_DLLPUBLIC void SetTabNo( SCTAB nTab, bool bNew = false, bool bExtendSelection = false, bool bSameTabButMoved = false ); - void SelectNextTab( short nDir, bool bExtendSelection = false ); + void SelectNextTab( short nDir, bool bExtendSelection ); void SelectTabPage( const sal_uInt16 nTab ); void ActivateView( bool bActivate, bool bFirst ); @@ -435,7 +435,7 @@ public: void CheckNeedsRepaint(); bool NeedsRepaint(); - void PaintRangeFinder( long nNumber = -1 ); + void PaintRangeFinder( long nNumber ); void AddHighlightRange( const ScRange& rRange, const Color& rColor ); void ClearHighlightRanges(); @@ -501,7 +501,7 @@ public: bool IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; void PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void PaintBlock( bool bReset = false ); + void PaintBlock( bool bReset ); void SetMarkData( const ScMarkData& rNew ); void MarkDataChanged(); @@ -509,7 +509,7 @@ public: void LockModifiers( sal_uInt16 nModifiers ); sal_uInt16 GetLockedModifiers() const; void ViewOptionsHasChanged( bool bHScrollChanged, - bool bGraphicsChanged = false); + bool bGraphicsChanged); Point GetMousePosPixel(); @@ -521,7 +521,7 @@ public: void ErrorMessage( sal_uInt16 nGlobStrId ); - void EnableRefInput(bool bFlag = true); + void EnableRefInput(bool bFlag); vcl::Window* GetFrameWin() const { return pFrameWin; } diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index a5a55981cc6f..68546489be89 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -168,7 +168,7 @@ private: OUString maScope; private: - void Construct( TriState nForceDesignMode = TRISTATE_INDET ); + void Construct( TriState nForceDesignMode ); SfxShell* GetMySubShell() const; @@ -344,7 +344,7 @@ public: void InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget, sal_uInt16 nMode ); void InsertURLButton( const OUString& rName, const OUString& rURL, const OUString& rTarget, - const Point* pInsPos = nullptr ); + const Point* pInsPos ); void InsertURLField( const OUString& rName, const OUString& rURL, const OUString& rTarget ); bool SelectObject( const OUString& rName ); @@ -357,9 +357,9 @@ public: static void UpdateNumberFormatter( const SvxNumberInfoItem& rInfoItem ); - void ExecuteCellFormatDlg( SfxRequest& rReq, const OString &rTabPage = OString()); + void ExecuteCellFormatDlg( SfxRequest& rReq, const OString &rTabPage); - bool GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode = 0 ); + bool GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode ); void StartSimpleRefDialog( const OUString& rTitle, const OUString& rInitVal, bool bCloseOnButtonUp, bool bSingleCell, bool bMultiSelection ); diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 6c62815e1de7..5cb81bf8725a 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -63,7 +63,7 @@ private: void InitDocShell(bool bLimitToPageSize); static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, - ScDocument* pDestDoc=nullptr, + ScDocument* pDestDoc, SCCOL nSubX=0, SCROW nSubY=0 ); static void PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPrintFactor, const ScRange& rBlock, bool bMetaFile ); diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 88495571d205..460947e192e3 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -194,7 +194,7 @@ public: } bool SetupRefDlg(); - bool RemoveRefDlg( bool bRestoreModal = true ); + bool RemoveRefDlg( bool bRestoreModal ); void SetModal( bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 6afc092c9643..190232644e54 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -127,11 +127,11 @@ public: bool PasteDataFormat( SotClipboardFormatId nFormatId, const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, - SCCOL nPosX, SCROW nPosY, Point* pLogicPos = nullptr, + SCCOL nPosX, SCROW nPosY, Point* pLogicPos, bool bLink = false, bool bAllowDialogs = false ); - bool PasteFile( const Point&, const OUString&, bool bLink=false ); - bool PasteObject( const Point&, const css::uno::Reference < css::embed::XEmbeddedObject >&, const Size* = nullptr, const Graphic* = nullptr, const OUString& = OUString(), sal_Int64 nAspect = css::embed::Aspects::MSOLE_CONTENT ); + bool PasteFile( const Point&, const OUString&, bool bLink ); + bool PasteObject( const Point&, const css::uno::Reference < css::embed::XEmbeddedObject >&, const Size*, const Graphic* = nullptr, const OUString& = OUString(), sal_Int64 nAspect = css::embed::Aspects::MSOLE_CONTENT ); bool PasteBitmapEx( const Point&, const BitmapEx& ); bool PasteMetaFile( const Point&, const GDIMetaFile& ); bool PasteGraphic( const Point& rPos, const Graphic& rGraphic, @@ -220,7 +220,7 @@ public: bool TestMergeCells(); bool TestRemoveMerge(); - bool MergeCells( bool bApi, bool& rDoContents, bool bCenter = false ); + bool MergeCells( bool bApi, bool& rDoContents, bool bCenter ); bool RemoveMerge(); void FillSimple( FillDir eDir ); @@ -308,7 +308,7 @@ public: void InsertCurrentTime(short nCellFmt, const OUString& rUndoStr); - void ShowNote( bool bShow = true ); + void ShowNote( bool bShow ); void EditNote(); void ForgetFormatArea() { bFormatValid = false; } diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index fe284c48d54b..7e8d2aad945f 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -233,7 +233,7 @@ void ScInsertContentsDlg::TestModes() mpRbMoveRight->Disable(); mpBtnInsAll->Disable(); - DisableChecks(); + DisableChecks(true); } else { diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index ba3d9cd6b77d..bc5539126b8d 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -425,7 +425,7 @@ void ScNameDlg::NameModified() aLine.aName = aNewName; aLine.aExpression = aExpr; aLine.aScope = aNewScope; - m_pRangeManagerTable->addEntry(aLine); + m_pRangeManagerTable->addEntry(aLine, true); mbNeedUpdate = true; mbDataChanged = true; } diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index ba592c67ed2c..9cbf06693cba 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -352,7 +352,7 @@ void CommandToolBox::Select( sal_uInt16 nSelId ) else eNewMode = NAV_LMODE_NONE; } - rDlg.SetListMode( eNewMode ); + rDlg.SetListMode( eNewMode, true ); UpdateButtons(); } else @@ -641,13 +641,13 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl aLbEntries->SetRootType( nLastRoot ); aLbEntries->Refresh(); - GetDocNames(); + GetDocNames(nullptr); aTbxCmd->UpdateButtons(); UpdateColumn(); UpdateRow(); - UpdateTable(); + UpdateTable(nullptr); aLbEntries->Hide(); aWndScenarios->Hide(); aWndScenarios->SetPosPixel( aLbEntries->GetPosPixel() ); diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 72a9f0f5de27..e27cd12800de 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -762,7 +762,7 @@ IMPL_LINK_TYPED( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) ScHFEntryId eSel = static_cast<ScHFEntryId>(m_pLbDefined->GetSelectEntryPos()); if(!m_pLbDefined->IsTravelSelect()) { - ProcessDefinedListSel(eSel); + ProcessDefinedListSel(eSel, false); // check if we need to remove the customized entry. if(eSel < eEntryCount) diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index dfec1d1d94fe..6d29e11c2b78 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -752,7 +752,7 @@ void ScUndoMerge::Repeat(SfxRepeatTarget& rTarget) { ScTabViewShell& rViewShell = *static_cast<ScTabViewTarget&>(rTarget).GetViewShell(); bool bCont = false; - rViewShell.MergeCells( false, bCont ); + rViewShell.MergeCells( false, bCont, false ); } } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 784bacc89d31..aafd0cd6436a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1098,7 +1098,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFro * @return true if the corner was added, false otherwise. */ bool lcl_addUpperLeftCornerIfMissing(vector<ScTokenRef>& rRefTokens, - SCROW nCornerRowCount=1, SCCOL nCornerColumnCount=1) + SCROW nCornerRowCount, SCCOL nCornerColumnCount) { using ::std::max; using ::std::min; @@ -1512,7 +1512,7 @@ ScChart2DataProvider::createDataSource( shrinkToDataRange(m_pDocument, aRefTokens); if (bLabel) - lcl_addUpperLeftCornerIfMissing(aRefTokens); //#i90669# + lcl_addUpperLeftCornerIfMissing(aRefTokens, 1, 1); //#i90669# bool bColHeaders = (bOrientCol ? bLabel : bCategories ); bool bRowHeaders = (bOrientCol ? bCategories : bLabel ); diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index d009bda949ce..253c341338d9 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1361,7 +1361,7 @@ class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper< container::XNameR private: ScShapeObj* mpShape; - ScMacroInfo* getInfo( bool bCreate = false ) + ScMacroInfo* getInfo( bool bCreate ) { return ScShapeObj_getShapeHyperMacroInfo( mpShape, bCreate ); } @@ -1416,7 +1416,7 @@ public: uno::RuntimeException, std::exception) override { uno::Sequence< beans::PropertyValue > aProperties; - ScMacroInfo* pInfo = getInfo(); + ScMacroInfo* pInfo = getInfo(false); if ( aName == SC_EVENTACC_ONCLICK ) { diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 1f7cec941937..4e7fe86bc02d 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -2910,7 +2910,7 @@ ScVbaRange::getEntireRow() throw (uno::RuntimeException, std::exception) uno::Reference< excel::XRange > SAL_CALL ScVbaRange::getEntireColumn() throw (uno::RuntimeException, std::exception) { - return getEntireColumnOrRow(); + return getEntireColumnOrRow(true); } uno::Reference< excel::XComment > SAL_CALL @@ -5177,7 +5177,7 @@ ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, u void SAL_CALL ScVbaRange::Group( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { - groupUnGroup(); + groupUnGroup(false); } void SAL_CALL ScVbaRange::Ungroup( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) @@ -5185,7 +5185,7 @@ ScVbaRange::Ungroup( ) throw (script::BasicErrorException, uno::RuntimeExceptio groupUnGroup(true); } -static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, bool _bMerge = true ) throw ( uno::RuntimeException ) +static void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, bool _bMerge ) throw ( uno::RuntimeException ) { uno::Reference< util::XMergeable > xMergeable( xCellRange, uno::UNO_QUERY_THROW ); xMergeable->merge(_bMerge); @@ -5207,7 +5207,7 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, bool bAcross = false; Across >>= bAcross; if ( !bAcross ) - lcl_mergeCellsOfRange( mxRange ); + lcl_mergeCellsOfRange( mxRange, true ); else { uno::Reference< excel::XRange > oRangeRowsImpl = Rows( uno::Any() ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index cc65a90b5ccb..ed2a5601abaa 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -93,7 +93,7 @@ class ScVbaRange : public ScVbaRange_BASE throw (css::uno::RuntimeException, std::exception); void visitArray( ArrayVisitor& vistor ); - css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn = true ) throw( css::uno::RuntimeException ); + css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn ) throw( css::uno::RuntimeException ); void fillSeries( css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( css::uno::RuntimeException ); @@ -108,7 +108,7 @@ class ScVbaRange : public ScVbaRange_BASE css::uno::Reference< ov::excel::XRange > getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ); ScCellRangeObj* getCellRangeObj( ) throw ( css::uno::RuntimeException ); css::uno::Reference< ov::XCollection >& getBorders(); - void groupUnGroup( bool bUnGroup = false ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + void groupUnGroup( bool bUnGroup ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); css::uno::Reference< ov::excel::XRange > PreviousNext( bool bIsPrevious ); css::uno::Reference< ov::excel::XRange > SpecialCellsImpl( sal_Int32 nType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException ); css::awt::Point getPosition() throw ( css::uno::RuntimeException ); @@ -143,7 +143,7 @@ public: static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& sRangeName, ScDocShell* pDocSh, - formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( css::uno::RuntimeException, std::exception ); + formula::FormulaGrammar::AddressConvention eConv ) throw ( css::uno::RuntimeException, std::exception ); static css::uno::Reference< ov::excel::XRange > CellsHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, @@ -290,7 +290,7 @@ public: // * object should be a lightweight as possible // * we shouldn't need hacks like this below static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception); - static bool getCellRangesForAddress(ScRefFlags &rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); + static bool getCellRangesForAddress(ScRefFlags &rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ); virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override; diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 2d1df5f7bdfd..82fbcdf3e224 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -309,7 +309,7 @@ ScVbaValidation::getFormula1() throw (uno::RuntimeException, std::exception) // In VBA both formula and address can have a leading '=' // in result of getFormula1, however it *seems* that a named range or // real formula has to (or is expected to) have the '=' - if ( pDocSh && !ScVbaRange::getCellRangesForAddress( nFlags, sString, pDocSh, aCellRanges, eConv ) ) + if ( pDocSh && !ScVbaRange::getCellRangesForAddress( nFlags, sString, pDocSh, aCellRanges, eConv, 0 ) ) sString = "=" + sString; return sString; } diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index b1a36353a92b..42c62bbeb4d9 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -248,7 +248,7 @@ ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& T void SAL_CALL ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException, std::exception) { - Scroll( Down, Up, ToRight, ToLeft ); + Scroll( Down, Up, ToRight, ToLeft, false ); } void SAL_CALL diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index 7475ea4d195c..68b38e1484cc 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -49,7 +49,7 @@ protected: void SplitAtDefinedPosition( sal_Int32 nColumns, sal_Int32 nRows ); public: - void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll = false ) throw (css::uno::RuntimeException); + void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll ) throw (css::uno::RuntimeException); public: ScVbaWindow( diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 86c4f1fc0a7c..ccb1cdd40e21 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -541,7 +541,7 @@ void ScVbaWorksheets::PrintPreview( const css::uno::Any& /*EnableChanges*/ ) thr ScMarkData::MarkedTabsType aOldTabs = pPrvView->GetSelectedTabs(); pPrvView->SetSelectedTabs( aMarkData ); // force update - pPrvView->DataChanged(); + pPrvView->DataChanged(false); // set sensible first page long nPage = pPrvView->GetFirstPage( 1 ); pPrvView->SetPageNo( nPage ); diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index b804414c5a68..cc1ff7533114 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -803,7 +803,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_STATUS_SUM: { OUString aFuncStr; - if ( pTabViewShell->GetFunction( aFuncStr ) ) + if ( pTabViewShell->GetFunction( aFuncStr, 0 ) ) rSet.Put( SfxStringItem( nWhich, aFuncStr ) ); } break; diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index b0107206e236..67ffe2b7b4db 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -973,7 +973,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) SvMemoryStream aStream; aStream.SetStreamCharSet( RTL_TEXTENCODING_UNICODE ); ScImportExport::SetNoEndianSwap( aStream ); - aExport.ExportStream( aStream, OUString() ); + aExport.ExportStream( aStream, OUString(), SotClipboardFormatId::STRING ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE( pFact, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pFact is null!" ); @@ -998,7 +998,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aImport.SetImportBroadcast( true ); aImport.SetOverwriting( true ); aStream.Seek( 0 ); - aImport.ImportStream( aStream, OUString() ); + aImport.ImportStream( aStream, OUString(), SotClipboardFormatId::STRING ); pDocSh->GetUndoManager()->LeaveListAction(); } diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index f2dadc305bac..b70141345d17 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -367,7 +367,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) } else { - pTabViewShell->ExecuteCellFormatDlg( rReq ); + pTabViewShell->ExecuteCellFormatDlg( rReq, "" ); } } break; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 70662c9e5f75..76b6c2783eae 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -390,7 +390,7 @@ void ScDrawView::MarkListHasChanged() if ( nMarkCount == 0 && !pViewData->GetViewShell()->IsDrawSelMode() && !bInConstruct ) { // relock layers that may have been unlocked before - LockBackgroundLayer(); + LockBackgroundLayer(true); LockInternalLayer(); } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index d84877585b45..dba986a8249a 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2571,7 +2571,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) // range finder RfCorner rCorner = NONE; - if ( HitRangeFinder( rMEvt.GetPosPixel(), rCorner ) ) + if ( HitRangeFinder( rMEvt.GetPosPixel(), rCorner, nullptr, nullptr, nullptr ) ) { if (rCorner != NONE) SetPointer( Pointer( PointerStyle::Cross ) ); @@ -2584,7 +2584,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt ) sal_uInt16 nBreakType; if ( !nButtonDown && pViewData->IsPagebreakMode() && - ( nBreakType = HitPageBreak( rMEvt.GetPosPixel() ) ) != 0 ) + ( nBreakType = HitPageBreak( rMEvt.GetPosPixel(), nullptr, nullptr, nullptr ) ) != 0 ) { PointerStyle eNew = PointerStyle::Arrow; switch ( nBreakType ) @@ -3889,7 +3889,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) return nRet; } -static SotClipboardFormatId lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xTransfer, bool bPreferText = false ) +static SotClipboardFormatId lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xTransfer, bool bPreferText ) { TransferableDataHelper aDataHelper( xTransfer ); @@ -4475,7 +4475,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) SotClipboardFormatId nFormatId = bIsLink ? lcl_GetDropLinkId( rEvt.maDropEvent.Transferable ) : - lcl_GetDropFormatId( rEvt.maDropEvent.Transferable ); + lcl_GetDropFormatId( rEvt.maDropEvent.Transferable, false ); if ( nFormatId != SotClipboardFormatId::NONE ) { pScMod->SetInExecuteDrop( true ); // #i28468# prevent error messages from PasteDataFormat diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index a2a36f81a2cc..fb4171c84131 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -220,7 +220,7 @@ void ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) else if ( SvxZoomType::PAGEWIDTH == eZoom ) pPreview->SetZoom( pPreview->GetOptimalZoom(true) ); - UpdateNeededScrollBars(); + UpdateNeededScrollBars(false); } void ScPreviewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 99e6cad5736c..4b6f8d1993d8 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -1376,7 +1376,7 @@ bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) { case MOD_NONE: MoveCursorPage( 0, static_cast<SCsCOLROW>(nDX), SC_FOLLOW_FIX, bSel ); break; case MOD_ALT: MoveCursorPage( nDX, 0, SC_FOLLOW_FIX, bSel ); break; - case MOD_CTRL: SelectNextTab( nDX ); break; + case MOD_CTRL: SelectNextTab( nDX, false ); break; default: { // added to avoid warnings @@ -2001,7 +2001,7 @@ void ScTabView::KillEditView( bool bNoPaint ) // #i73567# the cell still has to be repainted if (bExtended || ( bAtCursor && !bNoPaint )) { - pGridWin[i]->Draw( nCol1, nRow1, nCol2, nRow2 ); + pGridWin[i]->Draw( nCol1, nRow1, nCol2, nRow2, SC_UPDATE_ALL ); pGridWin[i]->UpdateSelectionOverlay(); } } @@ -2531,7 +2531,7 @@ void ScTabView::ActivateView( bool bActivate, bool bFirst ) aViewData.Activate(bActivate); - PaintBlock(); // repaint, selection after active status + PaintBlock(false); // repaint, selection after active status if (!bActivate) HideAllCursors(); // Cursor diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index b2fdbdea9daa..7e7dba3106d1 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1512,7 +1512,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode ) // if the ViewShell is not yet constructed... if (rDoc.GetDrawLayer()) MakeDrawView( nForceDesignMode ); - ViewOptionsHasChanged(false); // possibly also creates DrawView + ViewOptionsHasChanged(false, false); // possibly also creates DrawView ::svl::IUndoManager* pMgr = pDocSh->GetUndoManager(); SetUndoManager( pMgr ); diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 874e6c0c42a3..9772bd7ca215 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -82,7 +82,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) break; case SC_HINT_DRWLAYER_NEW: - MakeDrawView(); + MakeDrawView(TRISTATE_INDET); break; case SC_HINT_DOC_SAVED: @@ -120,7 +120,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) break; case SC_HINT_SHOWRANGEFINDER: - PaintRangeFinder(); + PaintRangeFinder(-1); break; case SC_HINT_FORCESETTAB: diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 137d856549d3..c42c34571817 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -97,7 +97,7 @@ OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) ScImportExport aObj( pDoc, aRange ); aObj.SetFormulas( GetViewData().GetOptions().GetOption( VOPT_FORMULAS ) ); OUString aExportOUString; - aObj.ExportString( aExportOUString ); + aObj.ExportString( aExportOUString, SotClipboardFormatId::STRING ); aStrSelection = convertLineEnd(aExportOUString, LINEEND_CR); // replace Tab/CR with space, if for dialog or through Basic/SelectionTextExt, @@ -146,7 +146,7 @@ void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, con else { SC_MOD()->InputEnterHandler(); - InsertURLButton( rName, rURL, rTarget ); + InsertURLButton( rName, rURL, rTarget, nullptr ); } } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 44a79431fc0c..6507eaa3a40d 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -688,7 +688,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran return; PasteDataFormat( nFormatId, aDataHelper.GetTransferable(), - GetViewData().GetCurX(), GetViewData().GetCurY() ); + GetViewData().GetCurX(), GetViewData().GetCurY(), nullptr ); } } } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index c46cbd578ab5..01f9325e1aab 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -660,7 +660,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = aCnt.InsertEmbeddedObject( aMedium, aName ); if( xObj.is() ) - return PasteObject( rPos, xObj ); + return PasteObject( rPos, xObj, nullptr ); // If an OLE object can't be created, insert a URL button |