[Libreoffice-commits] core.git: basegfx/source compilerplugins/clang cui/source drawinglayer/source editeng/source include/basegfx include/sfx2 include/svx include/unotools include/xmloff sc/inc sc/qa sc/source sfx2/source unotools/source vcl/qa xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Oct 11 06:18:36 UTC 2016
basegfx/source/polygon/b2dpolypolygontools.cxx | 5
compilerplugins/clang/store/constantfunction.cxx | 87 ++++++-------
cui/source/options/optopencl.cxx | 4
cui/source/options/optopencl.hxx | 2
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 2
editeng/source/editeng/editobj.cxx | 9 -
editeng/source/items/numitem.cxx | 2
include/basegfx/polygon/b2dpolypolygontools.hxx | 6
include/sfx2/childwin.hxx | 1
include/sfx2/dispatch.hxx | 2
include/sfx2/dockwin.hxx | 1
include/svx/svdhdl.hxx | 4
include/unotools/fontcvt.hxx | 1
include/xmloff/xmlnume.hxx | 3
sc/inc/colorscale.hxx | 2
sc/inc/compiler.hxx | 4
sc/inc/document.hxx | 2
sc/qa/unit/ucalc.cxx | 1
sc/source/core/data/colorscale.cxx | 13 -
sc/source/core/data/documen8.cxx | 8 -
sc/source/core/data/validat.cxx | 4
sc/source/core/tool/interpr4.cxx | 2
sc/source/core/tool/odffmap.cxx | 6
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xeextlst.cxx | 2
sc/source/filter/oox/condformatbuffer.cxx | 2
sc/source/filter/xml/xmlcondformat.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sfx2/source/appl/childwin.cxx | 4
sfx2/source/control/dispatch.cxx | 8 -
sfx2/source/dialog/basedlgs.cxx | 2
sfx2/source/dialog/dockwin.cxx | 8 -
sfx2/source/dialog/splitwin.cxx | 2
sfx2/source/view/viewfrm.cxx | 26 ---
unotools/source/misc/fontcvt.cxx | 6
vcl/qa/cppunit/wmf/wmfimporttest.cxx | 3
xmloff/source/core/xmlimp.cxx | 4
xmloff/source/style/xmlnume.cxx | 8 -
xmloff/source/text/XMLPropertyBackpatcher.cxx | 6
xmloff/source/text/XMLPropertyBackpatcher.hxx | 5
41 files changed, 68 insertions(+), 197 deletions(-)
New commits:
commit 5c84f40ea2e86bf85c0a59201faf1431f16aee40
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Oct 10 13:49:12 2016 +0200
loplugin:constantfunction
update the plugin similarly to
commit 3ee3b36ae0c064fb5c81268d8d63444309d1b970
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 7 12:05:49 2016 +0200
loplugin:staticmethods: Don't be fooled by decls starting with macros
Change-Id: I98ac3216d5acf89a49a26feb089ae2fd34e6e510
Reviewed-on: https://gerrit.libreoffice.org/29665
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index 0c50e52..8e8f4c5 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -395,11 +395,6 @@ namespace basegfx
}
}
- void correctGrowShrinkPolygonPair(SAL_UNUSED_PARAMETER B2DPolyPolygon& /*rOriginal*/, SAL_UNUSED_PARAMETER B2DPolyPolygon& /*rGrown*/)
- {
- //TODO!
- }
-
B2DPolyPolygon reSegmentPolyPolygon(const B2DPolyPolygon& rCandidate, sal_uInt32 nSegments)
{
B2DPolyPolygon aRetval;
diff --git a/compilerplugins/clang/store/constantfunction.cxx b/compilerplugins/clang/store/constantfunction.cxx
index fd429ac..943cc7d 100644
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -21,50 +21,20 @@ namespace {
class ConstantFunction:
public RecursiveASTVisitor<ConstantFunction>, public loplugin::Plugin
{
- StringRef getFilename(SourceLocation loc);
+ StringRef getFilename(const FunctionDecl* functionDecl);
public:
explicit ConstantFunction(InstantiationData const & data): Plugin(data) {}
void run() override
{
// these files crash clang-3.5 somewhere in the isEvaluatable/EvaluateAsXXX stuff
- FileID mainFileID = compiler.getSourceManager().getMainFileID();
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(), "sc/source/core/data") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(), "sc/source/ui/app") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(), "sc/qa/unit") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "docuno.cxx") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "viewdata.cxx") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "calcoptionsdlg.cxx") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(), "sc/source/core/opencl") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(), "sc/source/core/tool") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(), "sc/source/core/tool") != 0) {
- return;
- }
- if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(), "desktop/source/lib") != 0) {
- return;
- }
+/* FileID mainFileID = compiler.getSourceManager().getMainFileID();
if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "bootstrapfixture.cxx") != 0) {
return;
}
if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "gtk3gtkinst.cxx") != 0) {
return;
- }
+ }*/
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
}
@@ -72,9 +42,9 @@ public:
bool VisitFunctionDecl(const FunctionDecl *);
};
-StringRef ConstantFunction::getFilename(SourceLocation loc)
+StringRef ConstantFunction::getFilename(const FunctionDecl* functionDecl)
{
- SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(loc);
+ SourceLocation spellingLocation = compiler.getSourceManager().getSpellingLoc(functionDecl->getCanonicalDecl()->getNameInfo().getLoc());
StringRef name { compiler.getSourceManager().getFilename(spellingLocation) };
return name;
}
@@ -90,12 +60,15 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
if (!pFunctionDecl->hasBody()) {
return true;
}
+ if (!pFunctionDecl->isThisDeclarationADefinition()) {
+ return true;
+ }
// stuff declared extern-C is almost always used as a some kind of callback
if (pFunctionDecl->isExternC()) {
return true;
}
- StringRef aFileName = getFilename(pFunctionDecl->getLocStart());
+ StringRef aFileName = getFilename(pFunctionDecl);
// various tests in here are empty stubs under Linux
if (aFileName.startswith(SRCDIR "/sal/qa/")) {
@@ -128,7 +101,7 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
return true;
}
// salplug runtime-loading mechanism at work
- if (getFilename(pFunctionDecl->getCanonicalDecl()->getLocStart()) == SRCDIR "/vcl/inc/salinst.hxx") {
+ if (aFileName == SRCDIR "/vcl/inc/salinst.hxx") {
return true;
}
// lots of callbacks here
@@ -144,7 +117,7 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
return true;
}
// used by code generated by python
- if (getFilename(pFunctionDecl->getCanonicalDecl()->getLocStart()) == SRCDIR "/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx") {
+ if (aFileName == SRCDIR "/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx") {
return true;
}
// this test just test the include of some headers
@@ -178,7 +151,7 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
if (isa<CXXConstructorDecl>(pFunctionDecl) || isa<CXXDestructorDecl>(pFunctionDecl) || isa<CXXConversionDecl>(pFunctionDecl)) {
return true;
}
- SourceLocation canonicalLoc = pFunctionDecl->getCanonicalDecl()->getLocStart();
+ SourceLocation canonicalLoc = pFunctionDecl->getCanonicalDecl()->getNameInfo().getLoc();
if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(canonicalLoc))) {
return true;
}
@@ -433,6 +406,28 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
if (aFunctionName == "clipboard_owner_init") {
return true;
}
+ // returns sizeof(struct) vcl/source/gdi/dibtools.cxx
+ if (aFunctionName == "getDIBV5HeaderSize") {
+ return true;
+ }
+ // windows only
+ if (aFunctionName == "InitAccessBridge") {
+ return true;
+ }
+ // callbacks
+ if (aFunctionName == "disabled_initSystray" || aFunctionName == "disabled_deInitSystray") {
+ return true;
+ }
+ // behind a BREAKPAD option
+ if (aFunctionName == "desktop::(anonymous namespace)::crashReportInfoExists") {
+ return true;
+ }
+ // LOK stuff
+ if (aFunctionName == "doc_getTileMode") {
+ return true;
+ }
+
+
std::string aImmediateMacro = "";
if (compiler.getSourceManager().isMacroBodyExpansion(pFunctionDecl->getLocStart()) ) {
@@ -456,6 +451,11 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
if (!pReturnStmt) {
return true;
}
+ if (const UnaryOperator* unaryOp = dyn_cast<UnaryOperator>(pReturnStmt->getRetValue())) {
+ if (unaryOp->getOpcode() == UO_AddrOf) {
+ return true;
+ }
+ }
if (pReturnStmt->getRetValue() != nullptr) {
// && !pReturnStmt->getRetValue()->isEvaluatable(compiler.getASTContext())) {
bool aBoolResult;
@@ -484,8 +484,13 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
DiagnosticsEngine::Warning,
aMessage,
pFunctionDecl->getLocStart())
- << pFunctionDecl->getSourceRange()
- << pFunctionDecl->getCanonicalDecl()->getSourceRange();
+ << pFunctionDecl->getSourceRange();
+ if (pFunctionDecl != pFunctionDecl->getCanonicalDecl())
+ report(
+ DiagnosticsEngine::Note,
+ aMessage,
+ pFunctionDecl->getCanonicalDecl()->getLocStart())
+ << pFunctionDecl->getCanonicalDecl()->getSourceRange();
return true;
}
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 05612b5..ec4f5b3 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -54,7 +54,6 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
mpUseOpenCL->Check(maConfig.mbUseOpenCL);
mpUseOpenCL->Enable(!officecfg::Office::Common::Misc::UseOpenCL::isReadOnly());
- mpUseOpenCL->SetClickHdl(LINK(this, SvxOpenCLTabPage, EnableOpenCLHdl));
bool bCLUsed = opencl::GPUEnv::isOpenCLEnabled();
mpOclUsed->Show(bCLUsed);
@@ -129,7 +128,4 @@ void SvxOpenCLTabPage::EnableOpenCLHdl(VclFrame* pFrame, bool aEnable)
}
-IMPL_STATIC_LINK_NOARG(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void)
-{
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index e656020..5680d91 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -37,8 +37,6 @@ private:
VclPtr<FixedText> mpOclUsed;
VclPtr<FixedText> mpOclNotUsed;
- DECL_STATIC_LINK(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void);
-
static void EnableOpenCLHdl(VclFrame* pFrame, bool aEnable);
public:
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index 768eed9..dba0f54 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -96,7 +96,7 @@ namespace
// use more precision, shrink the outer polygons. Since this may lead to self-intersections,
// some kind of correction should be applied here after that step
rOuterPolyPolygon = basegfx::tools::growInNormalDirection(rPolygon, -fOffset);
- basegfx::tools::correctGrowShrinkPolygonPair(rPolygon, rOuterPolyPolygon);
+ // basegfx::tools::correctGrowShrinkPolygonPair(rPolygon, rOuterPolyPolygon);
}
}
}
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 5fcc8c7..9ae54ef 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1175,8 +1175,6 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
if ( cConv )
aBuffer[nChar] = cConv;
}
-
- DestroyFontToSubsFontConverter( hConv );
}
}
}
@@ -1203,9 +1201,6 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
aBuffer[nChar] = cConv;
}
}
-
- DestroyFontToSubsFontConverter( hConv );
-
}
@@ -1432,8 +1427,6 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
if ( cConv )
pC->SetText(pC->GetText().replaceAt(nChar, 1, OUString(cConv)));
}
-
- DestroyFontToSubsFontConverter( hConv );
}
}
}
@@ -1464,8 +1457,6 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
pC->SetText(pC->GetText().replaceAt(nChar, 1, OUString(cConv)));
}
}
-
- DestroyFontToSubsFontConverter( hConv );
}
}
}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 3b6eba5..92e9a3b 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -687,8 +687,6 @@ void SvxNumRule::Store( SvStream &rStream )
}
//second save of nFeatureFlags for new versions
rStream.WriteUInt16( static_cast<sal_uInt16>(nFeatureFlags) );
- if(pConverter)
- DestroyFontToSubsFontConverter(pConverter);
}
void SvxNumRule::dumpAsXml(struct _xmlTextWriter* pWriter) const
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index 97817a8..90ec045 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -162,12 +162,6 @@ namespace basegfx
// with the given amount. Value may be negative.
BASEGFX_DLLPUBLIC B2DPolyPolygon growInNormalDirection(const B2DPolyPolygon& rCandidate, double fValue);
- // This method will correct a pair of polyPolygons where the goal is to keep same point count
- // to allow direct point association and also to remove self-intersections produced by shrinks.
- // This method might possibly change both polyPolygons to reach that goal because there are cases
- // where it is necessary to add new cut points to the original
- BASEGFX_DLLPUBLIC void correctGrowShrinkPolygonPair(B2DPolyPolygon& rOriginal, B2DPolyPolygon& rGrown);
-
// force all sub-polygons to a point count of nSegments
BASEGFX_DLLPUBLIC B2DPolyPolygon reSegmentPolyPolygon(const B2DPolyPolygon& rCandidate, sal_uInt32 nSegments);
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 6e1c336..8a77f2e 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -204,7 +204,6 @@ public:
void SetVisible_Impl( bool bVis );
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
SAL_DLLPRIVATE void Activate_Impl();
- SAL_DLLPRIVATE static void Deactivate_Impl();
SAL_DLLPRIVATE SfxChildWindowContext*
GetContext_Impl() const
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 783f0c2..a510a93 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -181,8 +181,6 @@ public:
SAL_DLLPRIVATE void SetQuietMode_Impl( bool bOn );
SAL_DLLPRIVATE bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const;
SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell );
- SAL_DLLPRIVATE static void DoParentActivate_Impl();
- SAL_DLLPRIVATE static void DoParentDeactivate_Impl();
SAL_DLLPRIVATE void DoActivate_Impl( bool bMDI );
SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew );
SAL_DLLPRIVATE void InvalidateBindings_Impl(bool);
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 9d10cf5..379340d 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -102,7 +102,6 @@ public:
DECL_LINK(TimerHdl, Idle *, void);
SAL_DLLPRIVATE void Initialize_Impl();
- SAL_DLLPRIVATE static SplitWindowItemFlags GetWinBits_Impl();
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
SAL_DLLPRIVATE void Disappear_Impl();
SAL_DLLPRIVATE void Reappear_Impl();
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 553237d..eceb492 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -429,8 +429,8 @@ protected:
bool bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit)
private:
- SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList() {}
- SVX_DLLPRIVATE void operator=(const SdrHdlList&) {}
+ SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&) = delete;
+ SVX_DLLPRIVATE void operator=(const SdrHdlList&) = delete;
public:
explicit SdrHdlList(SdrMarkView* pV);
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index ae6db9e..bd640bd 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -39,7 +39,6 @@ namespace o3tl
typedef void* FontToSubsFontConverter;
UNOTOOLS_DLLPUBLIC FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rFontName, FontToSubsFontFlags nFlags );
-UNOTOOLS_DLLPUBLIC void DestroyFontToSubsFontConverter( FontToSubsFontConverter hConverter );
UNOTOOLS_DLLPUBLIC sal_Unicode ConvertFontToSubsFontChar( FontToSubsFontConverter hConverter, sal_Unicode c );
UNOTOOLS_DLLPUBLIC OUString GetFontToSubsFontName( FontToSubsFontConverter hConverter );
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index e8b430c..4583c18 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -56,9 +56,6 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport
protected:
- /// Override this to add attributes to the <list-style> element.
- SAL_DLLPRIVATE static void AddListStyleAttributes();
-
SAL_DLLPRIVATE void exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle );
SAL_DLLPRIVATE void exportOutline();
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index d9a9bd1..840b682 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -361,7 +361,7 @@ public:
virtual condformat::ScFormatEntryType GetType() const override;
- static ScIconSetMap* getIconSetMap();
+ static const ScIconSetMap g_IconSetMap[];
static BitmapEx& getBitmap(sc::IconSetBitmapMap& rBitmapMap, ScIconSetType eType, sal_Int32 nIndex);
typedef ScIconSetFormatData::Entries_t::iterator iterator;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 8c64856..20423ef 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -255,13 +255,13 @@ private:
static CharClass *pCharClassEnglish; // character classification for en_US locale
static const Convention *pConventions[ formula::FormulaGrammar::CONV_LAST ];
- static struct AddInMap
+ static const struct AddInMap
{
const char* pODFF;
const char* pEnglish;
const char* pOriginal; // programmatical name
const char* pUpper; // upper case programmatical name
- } maAddInMap[];
+ } g_aAddInMap[];
static const AddInMap* GetAddInMap();
static size_t GetAddInMapCount();
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 2dbe866..3994b83 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1930,8 +1930,6 @@ public:
bool GetHasMacroFunc() const { return bHasMacroFunc; }
void SetHasMacroFunc(bool bSet) { bHasMacroFunc = bSet; }
- static bool CheckMacroWarn();
-
void SetRangeOverflowType(sal_uInt32 nType) { nRangeOverflowType = nType; }
bool HasRangeOverflow() const { return nRangeOverflowType != 0; }
SC_DLLPUBLIC sal_uInt32 GetRangeOverflowType() const { return nRangeOverflowType; }
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 86e2ed6..d925b83c 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6041,7 +6041,6 @@ void Test::testEmptyCalcDocDefaults()
CPPUNIT_ASSERT_EQUAL( false, m_pDoc->IsInVBAMode() );
CPPUNIT_ASSERT_EQUAL( false, m_pDoc->HasNotes() );
CPPUNIT_ASSERT_EQUAL( false, m_pDoc->IsCutMode() );
- CPPUNIT_ASSERT_EQUAL( true, ScDocument::CheckMacroWarn() );
CPPUNIT_ASSERT_EQUAL( false, m_pDoc->IsUsingEmbededFonts() );
CPPUNIT_ASSERT_EQUAL( false, m_pDoc->IsEmbedded() );
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 25707bf..5f87b32 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1101,9 +1101,7 @@ double ScIconSetFormat::CalcValue(double nMin, double nMax, ScIconSetFormat::con
return (*itr)->GetValue();
}
-namespace {
-
-ScIconSetMap aIconSetMap[] = {
+const ScIconSetMap ScIconSetFormat::g_IconSetMap[] = {
{ "3Arrows", IconSet_3Arrows, 3 },
{ "3ArrowsGray", IconSet_3ArrowsGray, 3 },
{ "3Flags", IconSet_3Flags, 3 },
@@ -1129,13 +1127,6 @@ ScIconSetMap aIconSetMap[] = {
{ nullptr, IconSet_3Arrows, 0 }
};
-}
-
-ScIconSetMap* ScIconSetFormat::getIconSetMap()
-{
- return aIconSetMap;
-}
-
size_t ScIconSetFormat::size() const
{
return mpFormatData->m_Entries.size();
@@ -1299,7 +1290,7 @@ BitmapEx& ScIconSetFormat::getBitmap(sc::IconSetBitmapMap & rIconSetBitmapMap,
void ScIconSetFormat::EnsureSize()
{
ScIconSetType eType = mpFormatData->eIconSetType;
- for (ScIconSetMap & i : aIconSetMap)
+ for (const ScIconSetMap & i : g_IconSetMap)
{
if (i.eType == eType)
{
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index e99e32f..572d594 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1162,14 +1162,6 @@ void ScDocument::KeyInput( const KeyEvent& )
apTemporaryChartLock->StartOrContinueLocking();
}
-bool ScDocument::CheckMacroWarn()
-{
- // The check for macro configuration, macro warning and disabling is now handled
- // in SfxObjectShell::AdjustMacroMode, called by SfxObjectShell::CallBasic.
-
- return true;
-}
-
SfxBindings* ScDocument::GetViewBindings()
{
// used to invalidate slots after changes to this document
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 9eeca6d..acc192f 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -185,7 +185,7 @@ bool ScValidationData::DoScript( const ScAddress& rPos, const OUString& rInput,
{
ScDocument* pDocument = GetDocument();
SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
- if ( !pDocSh || !ScDocument::CheckMacroWarn() )
+ if ( !pDocSh )
return false;
bool bScriptReturnedFalse = false; // default: do not abort
@@ -271,7 +271,7 @@ bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput,
ScDocument* pDocument = GetDocument();
SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
- if ( !pDocSh || !ScDocument::CheckMacroWarn() )
+ if ( !pDocSh )
return false;
bool bDone = false;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index f9b2350..4d697f9 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3137,7 +3137,7 @@ void ScInterpreter::ScMacro()
OUString aMacro( pCur->GetExternal() );
SfxObjectShell* pDocSh = pDok->GetDocumentShell();
- if ( !pDocSh || !ScDocument::CheckMacroWarn() )
+ if ( !pDocSh )
{
PushNoValue(); // without DocShell no CallBasic
return;
diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx
index 4a37e2f..c97d167 100644
--- a/sc/source/core/tool/odffmap.cxx
+++ b/sc/source/core/tool/odffmap.cxx
@@ -22,7 +22,7 @@
// ODFF, English, MapDupToInternal when writing ODFF, Programmatical, ODF_11
// functions duplicated to internal when writing ODFF are listed in static const XclFunctionInfo saFuncTable_4[]
-ScCompiler::AddInMap ScCompiler::maAddInMap[] =
+const ScCompiler::AddInMap ScCompiler::g_aAddInMap[] =
{
{ "ORG.OPENOFFICE.WEEKS", "WEEKS", "com.sun.star.sheet.addin.DateFunctions.getDiffWeeks", "COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFWEEKS" },
{ "ORG.OPENOFFICE.MONTHS", "MONTHS", "com.sun.star.sheet.addin.DateFunctions.getDiffMonths", "COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFMONTHS" },
@@ -137,12 +137,12 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] =
const ScCompiler::AddInMap* ScCompiler::GetAddInMap()
{
- return maAddInMap;
+ return g_aAddInMap;
}
size_t ScCompiler::GetAddInMapCount()
{
- return SAL_N_ELEMENTS(maAddInMap);
+ return SAL_N_ELEMENTS(g_aAddInMap);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index cfa6c5a..9f2c364 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1431,7 +1431,7 @@ namespace {
const char* getIconSetName( ScIconSetType eType )
{
- ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap();
+ const ScIconSetMap* pMap = ScIconSetFormat::g_IconSetMap;
for(; pMap->pName; ++pMap)
{
if(pMap->eType == eType)
diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index 921642a..c1b1252 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -21,7 +21,7 @@ namespace {
const char* getIconSetName( ScIconSetType eType )
{
- ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap();
+ const ScIconSetMap* pMap = ScIconSetFormat::g_IconSetMap;
for(; pMap->pName; ++pMap)
{
if(pMap->eType == eType)
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 1ff1d7a..8481d1e5 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -368,7 +368,7 @@ namespace {
ScIconSetType getType(const OUString& rName)
{
ScIconSetType eIconSetType = IconSet_3TrafficLights1;
- ScIconSetMap* pIconSetMap = ScIconSetFormat::getIconSetMap();
+ const ScIconSetMap* pIconSetMap = ScIconSetFormat::g_IconSetMap;
for(size_t i = 0; pIconSetMap[i].pName; ++i)
{
if(OUString::createFromAscii(pIconSetMap[i].pName) == rName)
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index 7e0e0c0..0850bcf 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -348,7 +348,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u
}
}
- ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap();
+ const ScIconSetMap* pMap = ScIconSetFormat::g_IconSetMap;
ScIconSetType eType = IconSet_3Arrows;
for(; pMap->pName; ++pMap)
{
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index b7f5a10..c9aeb29 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4158,7 +4158,7 @@ OUString getCondFormatEntryType(const ScColorScaleEntry& rEntry, bool bFirst = t
OUString getIconSetName(ScIconSetType eType)
{
const char* pName = nullptr;
- ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap();
+ const ScIconSetMap* pMap = ScIconSetFormat::g_IconSetMap;
for(;pMap->pName;++pMap)
{
if(pMap->eType == eType)
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 921f578..68e25c8 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1564,7 +1564,7 @@ void ScIconSetFrmtEntry::Init()
IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl, ListBox&, void )
{
- ScIconSetMap* pMap = ScIconSetFormat::getIconSetMap();
+ const ScIconSetMap* pMap = ScIconSetFormat::g_IconSetMap;
sal_Int32 nPos = maLbIconSetType->GetSelectEntryPos();
sal_uInt32 nElements = pMap[nPos].nElements;
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 1d1fdb8..d3ea17c 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -658,10 +658,6 @@ void SfxChildWindow::Activate_Impl()
pImpl->pWorkWin->SetActiveChild_Impl( pWindow );
}
-void SfxChildWindow::Deactivate_Impl()
-{
-}
-
bool SfxChildWindow::QueryClose()
{
bool bAllow = true;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 3461946..11d950e 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -794,10 +794,6 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI)
}
}
-void SfxDispatcher::DoParentActivate_Impl()
-{
-}
-
/** This method controls the deactivation of a dispatcher.
Since the application dispatcher is always active, either as a sub
@@ -875,10 +871,6 @@ void SfxDispatcher::DoDeactivate_Impl(bool bMDI, SfxViewFrame* pNew)
Flush();
}
-void SfxDispatcher::DoParentDeactivate_Impl()
-{
-}
-
/** This method searches in SfxDispatcher after <SfxShell> , from the Slot Id
nSlot currently being handled. For this, the dispatcher is first flushed.
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index e401186..2fdeef8 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -333,7 +333,6 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() )
{
pBindings->SetActiveFrame( css::uno::Reference< css::frame::XFrame > () );
- SfxChildWindow::Deactivate_Impl();
}
else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -421,7 +420,6 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
if ( !HasChildPathFocus() )
{
pBindings->SetActiveFrame( nullptr );
- SfxChildWindow::Deactivate_Impl();
}
}
else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT )
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 9365efe..183600a 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1656,20 +1656,12 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() )
{
pBindings->SetActiveFrame( nullptr );
- if (pMgr != nullptr)
- SfxChildWindow::Deactivate_Impl();
}
return DockingWindow::Notify( rEvt );
}
-SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl()
-{
- return SplitWindowItemFlags::NONE;
-}
-
-
void SfxDockingWindow::SetItemSize_Impl( const Size& rSize )
{
pImpl->aSplitSize = rSize;
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 2e80e3b..ba2d871 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -663,7 +663,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
{
SfxDockingWindow* pDockWin = pDock->pWin;
- SplitWindowItemFlags nItemBits = SfxDockingWindow::GetWinBits_Impl();
+ SplitWindowItemFlags nItemBits = SplitWindowItemFlags::NONE;
long nWinSize, nSetSize;
if ( IsHorizontal() )
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 588a4eb..5406667 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1072,39 +1072,13 @@ bool SfxViewFrame::Close()
void SfxViewFrame::DoActivate( bool bUI )
{
SfxGetpApp();
-
m_pDispatcher->DoActivate_Impl( bUI );
-
- // If this ViewFrame has got a parent and this is not a parent of the
- // old ViewFrames, it gets a ParentActivate.
- if ( bUI )
- {
- SfxViewFrame *pFrame = GetParentViewFrame();
- while ( pFrame )
- {
- SfxDispatcher::DoParentActivate_Impl();
- pFrame = pFrame->GetParentViewFrame();
- }
- }
}
void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame )
{
SfxGetpApp();
m_pDispatcher->DoDeactivate_Impl( bUI, pNewFrame );
-
- // If this ViewFrame has got a parent and this is not a parent of the
- // new ViewFrames, it gets a ParentDeactivate.
- if ( bUI )
- {
- SfxViewFrame *pFrame = GetParentViewFrame();
- while ( pFrame )
- {
- if ( !pNewFrame || !pNewFrame->GetFrame().IsParent( &pFrame->GetFrame() ) )
- SfxDispatcher::DoParentDeactivate_Impl();
- pFrame = pFrame->GetParentViewFrame();
- }
- }
}
void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 729db87..9eb980c 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1413,12 +1413,6 @@ FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName,
return const_cast<ConvertChar *>(pCvt);
}
-void DestroyFontToSubsFontConverter(
- SAL_UNUSED_PARAMETER FontToSubsFontConverter )
-{
- //TODO: nothing to do for now, because we use static ImplCvtChars
-}
-
sal_Unicode ConvertFontToSubsFontChar(
FontToSubsFontConverter hConverter, sal_Unicode cChar )
{
diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index 67b8329..7698300 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -44,7 +44,7 @@ public:
// Hack around missing "once per class" setUp/tearDown in CppUnit; must be
// called before/after all other tests:
void globalSetUp() { test::setUpVcl(); }
- void globalTearDown() { /* DeInitVCL(); */ }
+ // void globalTearDown() { /* DeInitVCL(); */ }
// on e.g. Mac OS X, DeInitVCL() causes more trouble than it's worth,
// calling VclPtr<WorkWindow>::disposeAndClear -> ... ->
// vcl::Window::dispose -> UnoWrapper::WindowDestroy (tk) -> ... ->
@@ -69,7 +69,6 @@ public:
CPPUNIT_TEST(testWorldTransformFontSize);
CPPUNIT_TEST(testTdf93750);
CPPUNIT_TEST(testTdf99402);
- CPPUNIT_TEST(globalTearDown);
CPPUNIT_TEST_SUITE_END();
};
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 0e8f50a..a8ebb95 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -330,10 +330,6 @@ public:
~SvXMLImport_Impl()
{
- if( hBatsFontConv )
- DestroyFontToSubsFontConverter( hBatsFontConv );
- if( hMathFontConv )
- DestroyFontToSubsFontConverter( hMathFontConv );
}
sal_uInt16 getGeneratorVersion( const SvXMLImport& rImport )
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 073c2e7..dc0db67 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -612,11 +612,6 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
}
-void SvxXMLNumRuleExport::AddListStyleAttributes()
-{
-}
-
-
SvxXMLNumRuleExport::SvxXMLNumRuleExport( SvXMLExport& rExp ) :
rExport( rExp ),
sNumberingRules( "NumberingRules" ),
@@ -682,9 +677,6 @@ void SvxXMLNumRuleExport::exportNumberingRule(
GetExport().AddAttribute( XML_NAMESPACE_TEXT,
XML_CONSECUTIVE_NUMBERING, XML_TRUE );
- // other application specific attributes
- AddListStyleAttributes();
-
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_LIST_STYLE ,
true, true );
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 08c2c17..4483dc9 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -41,7 +41,6 @@ XMLPropertyBackpatcher<A>::XMLPropertyBackpatcher(
template<class A>
XMLPropertyBackpatcher<A>::~XMLPropertyBackpatcher()
{
- SetDefault();
}
@@ -114,11 +113,6 @@ void XMLPropertyBackpatcher<A>::SetProperty(
}
}
-template<class A>
-void XMLPropertyBackpatcher<A>::SetDefault()
-{
-}
-
// force instantiation of templates
template class XMLPropertyBackpatcher<sal_Int16>;
template class XMLPropertyBackpatcher<OUString>;
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index af31ec5..7533261 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -101,11 +101,6 @@ public:
void SetProperty(
css::uno::Reference<css::beans::XPropertySet> & xPropSet,
const OUString& sName);
-
- /// set default (if bDefaultHandling) for unresolved names
- /// called by destructor
- static void SetDefault();
-
};
#endif
More information about the Libreoffice-commits
mailing list