diff options
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/data/global.cxx | 3 | ||||
-rw-r--r-- | sc/source/core/opencl/opinlinefun_finacial.cxx | 38 | ||||
-rw-r--r-- | sc/source/filter/excel/impop.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/imp_op.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xlstream.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/content.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/viewfunc.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/navipi/content.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun4.cxx | 2 |
10 files changed, 0 insertions, 62 deletions
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 0c044fc4aeb5..4c389e2dc611 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -91,7 +91,6 @@ OUString ScGlobal::aStrClipDocName; std::unique_ptr<SvxBrushItem> ScGlobal::xEmptyBrushItem; std::unique_ptr<SvxBrushItem> ScGlobal::xButtonBrushItem; -std::unique_ptr<SvxBrushItem> ScGlobal::xEmbeddedBrushItem; std::unique_ptr<ScFunctionList> ScGlobal::xStarCalcFunctionList; std::unique_ptr<ScFunctionMgr> ScGlobal::xStarCalcFunctionMgr; @@ -442,7 +441,6 @@ void ScGlobal::Init() xEmptyBrushItem = std::make_unique<SvxBrushItem>( COL_TRANSPARENT, ATTR_BACKGROUND ); xButtonBrushItem = std::make_unique<SvxBrushItem>( Color(), ATTR_BACKGROUND ); - xEmbeddedBrushItem = std::make_unique<SvxBrushItem>( COL_LIGHTCYAN, ATTR_BACKGROUND ); InitPPT(); //ScCompiler::InitSymbolsNative(); @@ -539,7 +537,6 @@ void ScGlobal::Clear() xEmptyBrushItem.reset(); xButtonBrushItem.reset(); - xEmbeddedBrushItem.reset(); xEnglishFormatter.reset(); delete pCaseTransliteration.load(); pCaseTransliteration = nullptr; delete pTransliteration.load(); pTransliteration = nullptr; diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index 782e86b89f9e..bc036f274821 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -40,28 +40,6 @@ std::string Round = " return fValue;\n" "}\n"; -std::string GetPMTDecl = -"double GetPMT( double fRate, double fNper, double fPv, double fFv, int nPayType );\n"; - -std::string GetPMT= -"double GetPMT( double fRate, double fNper, double fPv, double fFv, int nPayType )\n" -"{\n" -" double fPmt;\n" -" if( fRate == 0.0 )\n" -" fPmt = ( fPv + fFv ) / fNper;\n" -" else\n" -" {\n" -" double fTerm = pow( 1.0 + fRate, fNper );\n" -" if( nPayType > 0 )\n" -" fPmt = ( fFv * fRate / ( fTerm - 1.0 ) + fPv * fRate / ( 1.0 - 1." -"0 / fTerm ) ) / ( 1.0 + fRate );\n" -" else\n" -" fPmt = fFv * fRate / ( fTerm - 1.0 ) + fPv * fRate /( 1.0 - 1.0 " -"/ fTerm );\n" -" }\n" -" return -fPmt;\n" -"}\n"; - std::string GetPMT_newDecl = "double GetPMT_new( double fRate, double fNper, double fPv, double fFv," "int nPayType );\n"; @@ -306,22 +284,6 @@ std::string ScaDate= " }\n" "}\n"; -std::string ScaDate2Decl= -"void ScaDate2( int nNullDate, int nDate, int nBase,int *bLastDayMode,int *" -"bLastDay,int *b30Days,int *bUSMode);\n"; - -std::string ScaDate2= -"void ScaDate2( int nNullDate, int nDate, int nBase,int *bLastDayMode,int *" -"bLastDay,int *b30Days,int *bUSMode)\n" -"{\n" -" int nOrigDay=0, nMonth=0, nYear=0;\n" -" DaysToDate( nNullDate + nDate, &nOrigDay, &nMonth, &nYear );\n" -" *bLastDayMode = (nBase != 5);\n" -" *bLastDay = (nOrigDay >= DaysInMonth( nMonth, nYear ));\n" -" *b30Days = (nBase == 0) || (nBase == 4);\n" -" *bUSMode = (nBase == 0);\n" -"}\n"; - std::string lcl_GetCouppcdDecl= "int lcl_GetCouppcd(int nNullDate,int nSettle,int nMat,int nFreq,int nBase);\n"; diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 9020ace75db9..e6d194dc513e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -70,8 +70,6 @@ using namespace ::com::sun::star; -const double ImportExcel::fExcToTwips = TWIPS_PER_CHAR / 256.0; - ImportTyp::ImportTyp( ScDocument* pDoc, rtl_TextEncoding eQ ) { eQuellChar = eQ; diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 3edb96dfe75a..9b38e4c5228c 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -85,8 +85,6 @@ protected: }; typedef std::unordered_map<SCCOL, LastFormula> LastFormulaMapType; - static const double fExcToTwips; // translate 1/256 chars -> Twips - RootData* pExcRoot; XclImpStream maStrm; // input stream diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index 583259ac7734..858e375d2cf8 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -30,7 +30,6 @@ const std::size_t EXC_REC_SEEK_TO_END = static_cast<std::size_t>( -1 ); const sal_uInt16 EXC_MAXRECSIZE_BIFF5 = 2080; const sal_uInt16 EXC_MAXRECSIZE_BIFF8 = 8224; -const ErrCode EXC_ENCR_ERROR_WRONG_PASS = ERRCODE_SVX_WRONGPASS; const ErrCode EXC_ENCR_ERROR_UNSUPP_CRYPT = ERRCODE_SVX_READ_FILTER_CRYPT; const sal_uInt16 EXC_ENCR_BLOCKSIZE = 1024; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 7e02078129e7..53f234fdd145 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -60,8 +60,6 @@ class ScContentTree o3tl::enumarray<ScContentId, sal_uInt16> pPosList; // for the sequence - static bool bIsInDrag; // static, if the Navigator is deleted in ExecuteDrag - ScDocShell* GetManualOrCurrent(); void InitRoot(ScContentId nType); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index a8d4a25985c6..d23215c84088 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -373,7 +373,6 @@ private: SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount ); }; -extern bool bPasteIsDrop; extern bool bPasteIsMove; #endif diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index b10cbcc7d615..6d45aed39a95 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -83,8 +83,6 @@ const OUStringLiteral aContentBmps[]= u"" RID_BMP_CONTENT_DRAWING }; -bool ScContentTree::bIsInDrag = false; - ScDocShell* ScContentTree::GetManualOrCurrent() { ScDocShell* pSh = nullptr; @@ -1232,7 +1230,6 @@ IMPL_LINK(ScContentTree, DragBeginHdl, bool&, rUnsetDragIcon, bool) bool bDisallow = true; std::unique_ptr<ScDocumentLoader> pDocLoader; - bIsInDrag = true; ScModule* pScMod = SC_MOD(); @@ -1376,8 +1373,6 @@ IMPL_LINK(ScContentTree, DragBeginHdl, bool&, rUnsetDragIcon, bool) } } - bIsInDrag = false; // static member - return bDisallow; } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 9b30f3513a80..ddf50551b635 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4477,10 +4477,8 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) if ( nFormatId != SotClipboardFormatId::NONE ) { pScMod->SetInExecuteDrop( true ); // #i28468# prevent error messages from PasteDataFormat - bPasteIsDrop = true; bDone = pViewData->GetView()->PasteDataFormat( nFormatId, rEvt.maDropEvent.Transferable, nPosX, nPosY, &aLogicPos, bIsLink ); - bPasteIsDrop = false; pScMod->SetInExecuteDrop( false ); } @@ -4548,11 +4546,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) { SotClipboardFormatId nFormatId = lcl_GetDropFormatId( xTransferable, true ); if ( nFormatId != SotClipboardFormatId::NONE ) - { - bPasteIsDrop = true; pViewData->GetView()->PasteDataFormat( nFormatId, xTransferable, nPosX, nPosY, &aLogicPos ); - bPasteIsDrop = false; - } } } } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index ef0501afc469..270dd0081641 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -74,8 +74,6 @@ using namespace com::sun::star; -bool bPasteIsDrop = false; - void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ) { |