diff options
66 files changed, 10 insertions, 268 deletions
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index e50eaef3d3b7..deb737656f1f 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -317,7 +317,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 2a097ac098d9..f51bd722a4f4 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -544,7 +544,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resary.hxx> #include <tools/resid.hxx> diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index cb8cc3a5c3c2..4f55047944b4 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -24,7 +24,6 @@ #include <tools/errinf.hxx> #include <comphelper/solarmutex.hxx> #include <basic/sbx.hxx> -#include <tools/rc.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> #include "image.hxx" diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index afdaf38929dc..80a8c3b6cfa8 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -497,7 +497,6 @@ #include <tools/mapunit.hxx> #include <tools/multisel.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index a3368f45f921..6ed900d97e15 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -28,7 +28,7 @@ usedReturnSet = set() # set of tuple(return_type, name_and_params) unusedMethodsExclusionSet = set([ # only used by Windows build "_Bool basegfx::B2ITuple::equalZero() const", - "class basegfx::B2DPolyPolygon basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const", + "const class basegfx::B2DPolyPolygon & basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const", "void basegfx::B2IRange::expand(const class basegfx::B2IRange &)", "void OpenGLContext::requestSingleBufferedRendering()", "_Bool TabitemValue::isBothAligned() const", @@ -263,6 +263,10 @@ for d in definitionSet: if location.startswith("include/test"): continue # leave the debug/dump alone if location.startswith("include/oox/dump"): continue + # plugin testing stuff + if location.startswith("compilerplugins/clang/test"): continue + # leave this alone for now + if location.startswith("include/LibreOfficeKit"): continue unusedSet.add(d) # used by the "unused return types" analysis tmp1set.add((method, location)) diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index b4fd867ba653..d78d9e0ed0da 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx @@ -194,7 +194,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index a071f598c8f6..e3f729574910 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -458,7 +458,6 @@ #include <tools/mapunit.hxx> #include <tools/multisel.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index d4e2b5e9cee1..9b6a07eb3a1b 100644 --- a/dbaccess/inc/pch/precompiled_dba.hxx +++ b/dbaccess/inc/pch/precompiled_dba.hxx @@ -276,7 +276,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx index 4601561b47cd..6415c84daf91 100644 --- a/dbaccess/inc/pch/precompiled_dbmm.hxx +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -202,7 +202,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 07392df7337c..c572c0098654 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -139,7 +139,6 @@ #include <tools/diagnose_ex.h> #include <tools/gen.hxx> #include <tools/link.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/solar.h> diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index c7dfd15ca7f1..91d116c3b685 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -401,10 +401,6 @@ namespace dbaui */ css::uno::Reference< css::util::XNumberFormatter > getNumberFormatter(const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); - // this completes a help url with the system parameters "Language" and "System" - // detect installed locale - void AppendConfigToken( OUString& _rURL, bool _bQuestionMark ); - } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_UITOOLS_HXX diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index cbdf38c950e0..da48f4bcb9fc 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1083,23 +1083,6 @@ OUString getStrippedDatabaseName(const Reference<XPropertySet>& _xDataSource,OUS return sName; } -void AppendConfigToken( OUString& _rURL, bool _bQuestionMark ) -{ - // query part exists? - if ( _bQuestionMark ) - // no, so start with '?' - _rURL += "?"; - else - // yes, so only append with '&' - _rURL += "&"; - - // set parameters - _rURL += "Language="; - _rURL += utl::ConfigManager::getLocale(); - _rURL += "&System="; - _rURL += SvtHelpOptions().GetSystem(); -} - void setEvalDateFormatForFormatter(Reference< css::util::XNumberFormatter >& _rxFormatter) { OSL_ENSURE( _rxFormatter.is(),"setEvalDateFormatForFormatter: Formatter is NULL!"); diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index 5fdb0c3159ff..057b8d98cd3e 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -246,7 +246,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index 1d1ab237d3a7..ace028201e39 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -274,7 +274,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 6568818c7038..154e51e6f7e1 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -27,7 +27,6 @@ #include "osl/mutex.hxx" #include <svl/zforlist.hxx> -#include <tools/rc.hxx> #include <tools/rcid.h> #include <tools/resary.hxx> #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx index e2e00f42ccb2..7db2f996160c 100644 --- a/framework/inc/pch/precompiled_fwe.hxx +++ b/framework/inc/pch/precompiled_fwe.hxx @@ -217,7 +217,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/framework/inc/pch/precompiled_fwi.hxx b/framework/inc/pch/precompiled_fwi.hxx index 2ace09193c47..d907b87357d4 100644 --- a/framework/inc/pch/precompiled_fwi.hxx +++ b/framework/inc/pch/precompiled_fwi.hxx @@ -156,7 +156,6 @@ #include <tools/lineend.hxx> #include <tools/link.hxx> #include <tools/mapunit.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index c27cb3d18eb9..9ba34417bab8 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -342,7 +342,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx index 048cc4726e5d..b753e93bd239 100644 --- a/framework/inc/pch/precompiled_fwl.hxx +++ b/framework/inc/pch/precompiled_fwl.hxx @@ -325,7 +325,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/framework/source/uiconfiguration/ImageList.cxx b/framework/source/uiconfiguration/ImageList.cxx index 58ef22c53ff8..46202f8c8a38 100644 --- a/framework/source/uiconfiguration/ImageList.cxx +++ b/framework/source/uiconfiguration/ImageList.cxx @@ -20,7 +20,6 @@ #include <osl/file.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> -#include <tools/rc.hxx> #include <tools/resmgr.hxx> #include <vcl/settings.hxx> #include <vcl/outdev.hxx> diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 3ad467e49e8e..cbade65eddfd 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -57,17 +57,6 @@ public: virtual ~ItemUpdateReceiverInterface(); }; - /** This is the preferred constructor that allows the created - controller item to return non-empty values for GetLabel() and - GetIcon() calls. - */ - ControllerItem ( - const sal_uInt16 nSlotId, - SfxBindings &rBindings, - ItemUpdateReceiverInterface& rItemUpdateReceiver, - const ::rtl::OUString& rsCommandName, - const css::uno::Reference<css::frame::XFrame>& rxFrame); - /** This is the simpler constructor variant that still exists for compatibility resons. Note that GetLabel() and GetIcon() will return empty strings/images. diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 003c013fe365..3659e68b1d70 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -198,11 +198,8 @@ public: SAL_DLLPRIVATE bool InsertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ); - SAL_DLLPRIVATE void CopyToClipboard( vcl::Window* pWindow, sal_uIntPtr nPos ); SAL_DLLPRIVATE void StartDrag( vcl::Window* pWindow, sal_uIntPtr nPos ); -public: - SAL_DLLPRIVATE SvStream& WriteData( SvStream& rOut ) const; SAL_DLLPRIVATE SvStream& ReadData( SvStream& rIn ); static void InsertAllThemes( ListBox& rListBox ); diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 72dee0b69bd4..e2c58b5ea056 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -242,19 +242,6 @@ private: */ void writeSequence(const sal_Char * pSequence); - /** Write a sequence of octets. - - @descr The supplied sequence of Unicode characters is interpreted as - a sequence of octets. It is an error if any of the elements of the - sequence has a numerical value greater than 255. - - @param pBegin Points to the start of the sequence, must not be null. - - @param pEnd Points past the end of the sequence, must be >= pBegin. - */ - void writeSequence(const sal_Unicode * pBegin, - const sal_Unicode * pEnd); - public: /** Write a single octet. diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx deleted file mode 100644 index 2338f7ed593f..000000000000 --- a/include/tools/rc.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_TOOLS_RC_HXX -#define INCLUDED_TOOLS_RC_HXX - -#include <tools/toolsdllapi.h> -#include <tools/resmgr.hxx> - -class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Resource -{ -protected: - ResMgr* m_pResMgr; - - // check Resource state -#ifdef DBG_UTIL - void TestRes(); -#endif - - // constructors - Resource() : m_pResMgr( nullptr ) {} - -public: -#ifdef DBG_UTIL - ~Resource() { TestRes(); } -#endif -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx index f9f0b68ff252..329f39aaf0c2 100644 --- a/include/tools/resid.hxx +++ b/include/tools/resid.hxx @@ -58,10 +58,6 @@ class SAL_WARN_UNUSED ResId } public: - ResId( RSHEADER_TYPE * pRc, ResMgr& rMgr ) - { - ImplInit( 0, rMgr, pRc ); - } ResId( sal_uInt32 nId, ResMgr& rMgr ) { ImplInit( nId, rMgr, nullptr ); diff --git a/include/vcl/ImageTree.hxx b/include/vcl/ImageTree.hxx index ecbd6ff0fdaa..4af873177052 100644 --- a/include/vcl/ImageTree.hxx +++ b/include/vcl/ImageTree.hxx @@ -59,10 +59,6 @@ public: BitmapEx & bitmap, bool localized, const ImageLoadFlags eFlags = ImageLoadFlags::NONE); - bool loadDefaultImage( - OUString const & style, - BitmapEx& bitmap); - VCL_DLLPUBLIC css::uno::Reference<css::container::XNameAccess> getNameAccess(); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index f5da72b5c109..d5510780831c 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -250,7 +250,6 @@ public: const css::uno::Reference<css::frame::XFrame>& rFrame); void InsertSeparator(const OString &rIdent = OString(), sal_uInt16 nPos = MENU_APPEND); void RemoveItem( sal_uInt16 nPos ); - void CopyItem(const Menu& rMenu, sal_uInt16 nPos ); void Clear(); void CreateAutoMnemonics(); diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index e5cb5aa9141a..3be45770a7b0 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -316,7 +316,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index d7b6b8505467..b5021b26cebf 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -526,7 +526,6 @@ #include <tools/mapunit.hxx> #include <tools/multisel.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index f56ba91f122f..d9b222154c9a 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -79,7 +79,6 @@ class RscTypCont void Init(); // initializes classes and tables void SETCONST( RscConst *, const char *, sal_uInt32 ); void SETCONST( RscConst *, Atom, sal_uInt32 ); - void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } RscEnum * InitFieldUnitsType(); RscTupel * InitStringLongTupel(); static RscCont * InitStringLongTupelList( RscTupel * pStringLongTupel ); diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index cf26e05bee7a..ccfe95471dd9 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -148,8 +148,6 @@ public: void Put( sal_uInt32 nValue ) { Put( (sal_Int32)nValue ); } void Put( sal_uInt16 nValue ); - void Put( sal_Int16 nValue ) - { Put( (sal_uInt16)nValue ); } void PutUTF8( char * pData ); void PutAt( sal_uInt32 nPos, sal_Int32 lVal ) diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index c5f20e5f1f07..7770a480f558 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -563,7 +563,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 6e488404ab21..b31316078bc3 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -33,10 +33,11 @@ #include <math.h> #include <tools/resid.hxx> -#include <tools/rc.hxx> #include "analysisdefs.hxx" +#include <vector> + class ResMgr; diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index e06c292f9780..f93c1284fc8e 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -34,7 +34,6 @@ #include <com/sun/star/sheet/addin/XMiscFunctions.hpp> #include <cppuhelper/implbase.hxx> #include <tools/resid.hxx> -#include <tools/rc.hxx> #include <tools/resary.hxx> class ScaResId : public ResId diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index abeb6ab0286a..efe8c0b1b5a9 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -38,7 +38,6 @@ #include <com/sun/star/sheet/addin/XPricingFunctions.hpp> #include <cppuhelper/implbase.hxx> #include <tools/resid.hxx> -#include <tools/rc.hxx> #include <tools/resary.hxx> #define RETURN_FINITE(d) if( ::rtl::math::isFinite( d ) ) return d; else throw css::lang::IllegalArgumentException() diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index c4e11c489ed4..66e2a70b3755 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -499,7 +499,6 @@ #include <tools/mapunit.hxx> #include <tools/multisel.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 9dd2e27ebfa8..570c23b28def 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -403,7 +403,6 @@ #include <tools/globname.hxx> #include <tools/link.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/rcid.h> #include <tools/ref.hxx> #include <tools/resid.hxx> diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 1b5c039a8700..9b5e53f5d544 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -27,7 +27,7 @@ #include <glib.h> #include <osl/mutex.hxx> #include <osl/module.hxx> -#include "tools/rc.hxx" +#include <tools/resmgr.hxx> #include <sfx2/app.hxx> #include "app.hrc" #include "shutdownicon.hxx" diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index 5821500bd928..c6b693871f38 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -19,7 +19,6 @@ #include <osl/diagnose.h> #include <sfx2/styfitem.hxx> -#include <tools/rc.hxx> #include <tools/rcid.h> #include <tools/debug.hxx> diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index cfa3d1d77780..40719fcc5a11 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -22,7 +22,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <tools/rc.hxx> #include <tools/rcid.h> #include <tools/resid.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index 7a1ac1f588b6..2ebff3df3a8c 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -35,55 +35,6 @@ using namespace css; using namespace css::uno; -namespace -{ - typedef ::cppu::WeakComponentImplHelper < - css::frame::XFrameActionListener - > FrameActionListenerInterfaceBase; - - class FrameActionListener - : public ::cppu::BaseMutex, - public FrameActionListenerInterfaceBase - { - public: - FrameActionListener ( - sfx2::sidebar::ControllerItem& rControllerItem, - const Reference<frame::XFrame>& rxFrame) - : FrameActionListenerInterfaceBase(m_aMutex), - mrControllerItem(rControllerItem), - mxFrame(rxFrame) - { - if (mxFrame.is()) - mxFrame->addFrameActionListener(this); - } - - virtual void SAL_CALL disposing() override - { - SolarMutexGuard g; - if (mxFrame.is()) - mxFrame->removeFrameActionListener(this); - } - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override - { - (void)rEvent; - - SolarMutexGuard g; - mrControllerItem.ResetFrame(); - mxFrame = nullptr; - } - virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent) override - { - SolarMutexGuard g; - if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED) - mrControllerItem.NotifyFrameContextChange(); - } - - private: - sfx2::sidebar::ControllerItem& mrControllerItem; - Reference<frame::XFrame> mxFrame; - }; -} - namespace sfx2 { namespace sidebar { ControllerItem::ControllerItem ( @@ -98,20 +49,6 @@ ControllerItem::ControllerItem ( { } -ControllerItem::ControllerItem ( - const sal_uInt16 nSlotId, - SfxBindings &rBindings, - ItemUpdateReceiverInterface& rItemUpdateReceiver, - const ::rtl::OUString& rsCommandName, - const Reference<frame::XFrame>& rxFrame) - : SfxControllerItem(nSlotId, rBindings), - mrItemUpdateReceiver(rItemUpdateReceiver), - mxFrame(rxFrame), - mxFrameActionListener(new FrameActionListener(*this, mxFrame)), - msCommandName(rsCommandName) -{ -} - ControllerItem::~ControllerItem() { dispose(); diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 7d4e18059b45..2b29083f5bd9 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -22,7 +22,6 @@ #include <sfx2/app.hxx> #include <tools/svborder.hxx> -#include <tools/rc.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index 6e98e34ed2d6..e4884ee250ba 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.hxx @@ -241,7 +241,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index 785e752bb27f..2bb928502c05 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.hxx @@ -144,7 +144,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/solar.h> diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 3e35885b3af8..68ada8d80923 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -24,7 +24,6 @@ #include <svl/lstner.hxx> #include <svtools/colorcfg.hxx> -#include "tools/rc.hxx" #include <sfx2/module.hxx> #include "starmath.hrc" diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 55c4d03ac730..acab2298a438 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -375,7 +375,6 @@ #include <tools/mapunit.hxx> #include <tools/multisel.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/rcid.h> #include <tools/ref.hxx> #include <tools/resid.hxx> diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 61a54c1cb93b..f9aaba9f6051 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -388,7 +388,6 @@ #include <tools/globname.hxx> #include <tools/link.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/resary.hxx> #include <tools/resmgr.hxx> #include <tools/solar.h> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 7001bea25230..454ecd4aa586 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -420,7 +420,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 9ec3adf6333f..0139756651d2 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1264,12 +1264,6 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran return bRet; } -void GalleryTheme::CopyToClipboard( vcl::Window* pWindow, sal_uIntPtr nPos ) -{ - GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false ); - pTransferable->CopyToClipboard( pWindow ); -} - void GalleryTheme::StartDrag( vcl::Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true ); diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 7437e931dfec..a7737003222f 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <tools/link.hxx> #include <tools/resary.hxx> -#include <tools/rc.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/accessibleeventnotifier.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index f595cb805e5a..bb4ba923e5ba 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -647,7 +647,6 @@ #include <tools/mapunit.hxx> #include <tools/mempool.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 974fcb88910f..2d586e6944b8 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -579,7 +579,6 @@ #include <tools/mempool.hxx> #include <tools/multisel.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 7d06a8772e9e..f8965404cbc6 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -375,7 +375,6 @@ #include <tools/mempool.hxx> #include <tools/multisel.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 469486668801..9015f844320c 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -21,7 +21,6 @@ #include <swdllapi.h> #include <rtl/ustring.hxx> -#include <tools/rc.hxx> #include <vcl/bitmap.hxx> struct SW_DLLPUBLIC ShellResource diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index dbb7ec74714c..724e2975bed5 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -36,14 +36,6 @@ #include <breakit.hxx> #include <vcl/window.hxx> -SwCallLink::SwCallLink( SwCursorShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent, - SwNodeType nAktNdTyp, long nLRPos, bool bAktSelection ) - : rShell( rSh ), nNode( nAktNode ), nContent( nAktContent ), - nNdTyp( nAktNdTyp ), nLeftFramePos( nLRPos ), - bHasSelection( bAktSelection ) -{ -} - SwCallLink::SwCallLink( SwCursorShell & rSh ) : rShell( rSh ) { diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx index 21e7ddf4acae..017a0d5852cf 100644 --- a/sw/source/core/crsr/callnk.hxx +++ b/sw/source/core/crsr/callnk.hxx @@ -37,9 +37,6 @@ public: bool bHasSelection; explicit SwCallLink( SwCursorShell & rSh ); - SwCallLink( SwCursorShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent, - SwNodeType nAktNdTyp, long nLRPos, - bool bAktSelection ); ~SwCallLink(); static long getLayoutFrame( const SwRootFrame*, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrame ); diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index da5dab7216cf..35afc28b73cb 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -1582,21 +1582,4 @@ void INetMIMEOutputSink::writeSequence(const sal_Char * pSequence) writeSequence(pSequence, pSequence + nLength); } -void INetMIMEOutputSink::writeSequence(const sal_Unicode * pBegin, - const sal_Unicode * pEnd) -{ - assert(pBegin && pBegin <= pEnd && - "INetMIMEOutputSink::writeSequence(): Bad sequence"); - - std::unique_ptr<sal_Char[]> pBufferBegin( new sal_Char[pEnd - pBegin] ); - sal_Char * pBufferEnd = pBufferBegin.get(); - while (pBegin != pEnd) - { - DBG_ASSERT(*pBegin < 256, - "INetMIMEOutputSink::writeSequence(): Bad octet"); - *pBufferEnd++ = sal_Char(*pBegin++); - } - writeSequence(pBufferBegin.get(), pBufferEnd); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index 2fb97564a298..2b972a8145f9 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -21,8 +21,8 @@ #include <rtl/ustring.hxx> #include <tools/date.hxx> #include <tools/time.hxx> -#include <tools/rc.hxx> #include <tools/rcid.h> +#include <tools/resmgr.hxx> OUString ResId::toString() const { diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index db8f9c10e362..8ef96d78d56d 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -30,7 +30,6 @@ #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/resmgr.hxx> -#include <tools/rc.hxx> #include <tools/rcid.h> #include <osl/endian.h> #include <osl/process.h> @@ -390,14 +389,6 @@ void ResMgrContainer::freeResMgr( InternalResMgr* pResMgr ) } } -#ifdef DBG_UTIL -void Resource::TestRes() -{ - if( m_pResMgr ) - m_pResMgr->TestStack(); -} -#endif - struct ImpContent { sal_uInt64 nTypeAndId; diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 6e6cda4743d6..d5251ca99aab 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/task/InteractionClassification.hpp> #include <tools/errcode.hxx> -#include <tools/rc.hxx> #include <tools/resary.hxx> #include <tools/wintypes.hxx> diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index fde6db7f4687..f2c461370595 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -18,6 +18,7 @@ */ #include <sal/config.h> +#include <osl/diagnose.h> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index d94941fc2973..b8596a418a1b 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.hxx @@ -322,7 +322,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index fc4e9fa80401..2299101f1a58 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -20,7 +20,6 @@ #include <osl/file.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> -#include <tools/rc.hxx> #include <tools/resmgr.hxx> #include <vcl/settings.hxx> #include <vcl/outdev.hxx> diff --git a/vcl/source/image/ImageTree.cxx b/vcl/source/image/ImageTree.cxx index 109a955922f3..a3b708affa4f 100644 --- a/vcl/source/image/ImageTree.cxx +++ b/vcl/source/image/ImageTree.cxx @@ -37,11 +37,6 @@ bool ImageTree::loadImage(OUString const & rName, OUString const & rStyle, return mpImplImageTree->loadImage(rName, rStyle, rBitmap, bLocalized, eFlags); } -bool ImageTree::loadDefaultImage(OUString const & rStyle, BitmapEx& rBitmap) -{ - return mpImplImageTree->loadDefaultImage(rStyle, rBitmap, ImageLoadFlags::NONE); -} - css::uno::Reference<css::container::XNameAccess> ImageTree::getNameAccess() { return mpImplImageTree->getNameAccess(); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 5991f123530d..02606828baa8 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -559,11 +559,6 @@ void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 n } } -void Menu::CopyItem( const Menu& rMenu, sal_uInt16 nPos ) -{ - ImplCopyItem( this, rMenu, nPos, MENU_APPEND ); -} - void Menu::Clear() { for ( sal_uInt16 i = GetItemCount(); i; i-- ) diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 884bd166cd79..4e82ff05954c 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -277,7 +277,6 @@ #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <tools/rc.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> |