diff options
57 files changed, 7 insertions, 717 deletions
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index e6a3f3cf4dc9..1eaffe1fa237 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -65,12 +65,6 @@ namespace comphelper } - void OAccessibleImplementationAccess::setAccessibleParent( const Reference< XAccessible >& _rxAccParent ) - { - m_pImpl->m_xAccParent = _rxAccParent; - } - - sal_Int64 OAccessibleImplementationAccess::implGetForeignControlledStates( ) const { return m_pImpl->m_nForeignControlledStates; @@ -98,39 +92,6 @@ namespace comphelper return nReturn; } - - OAccessibleImplementationAccess* OAccessibleImplementationAccess::getImplementation( const Reference< XAccessibleContext >& _rxComponent ) - { - OAccessibleImplementationAccess* pImplementation = nullptr; - try - { - Reference< XUnoTunnel > xTunnel( _rxComponent, UNO_QUERY ); - if ( xTunnel.is() ) - { - pImplementation = reinterpret_cast< OAccessibleImplementationAccess* >( - xTunnel->getSomething( getUnoTunnelImplementationId() ) ); - } - } - catch( const Exception& ) - { - OSL_FAIL( "OAccessibleImplementationAccess::setAccessibleParent: caught an exception while retrieving the implementation!" ); - } - return pImplementation; - } - - - bool OAccessibleImplementationAccess::setAccessibleParent( - const Reference< XAccessibleContext >& _rxComponent, const Reference< XAccessible >& _rxNewParent ) - { - OAccessibleImplementationAccess* pImplementation = getImplementation( _rxComponent ); - - if ( pImplementation ) - pImplementation->setAccessibleParent( _rxNewParent ); - - return ( nullptr != pImplementation ); - } - - } // namespace comphelper diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index fea9257d17eb..a9457a84fb39 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -60,12 +60,6 @@ OUString SAL_CALL OSimpleLogRing::getImplementationName_static() } -OUString SAL_CALL OSimpleLogRing::getSingletonName_static() -{ - return OUString( "com.sun.star.logging.DocumentIOLogRing" ); -} - - OUString SAL_CALL OSimpleLogRing::getServiceName_static() { return OUString( "com.sun.star.logging.SimpleLogRing" ); diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index e6c53bb3a291..ffd124e22154 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -52,8 +52,6 @@ public: static OUString SAL_CALL getImplementationName_static(); - static OUString SAL_CALL getSingletonName_static(); - static OUString SAL_CALL getServiceName_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index fe7b1590bf65..54bdac95ff1c 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -47,12 +47,6 @@ OUString SAL_CALL OOfficeRestartManager::getImplementationName_static() } -OUString SAL_CALL OOfficeRestartManager::getSingletonName_static() -{ - return OUString( "com.sun.star.task.OfficeRestartManager" ); -} - - OUString SAL_CALL OOfficeRestartManager::getServiceName_static() { return OUString( "com.sun.star.comp.task.OfficeRestartManager" ); diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index 6158e8e4511c..15a050f3855c 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -56,8 +56,6 @@ public: static OUString SAL_CALL getImplementationName_static(); - static OUString SAL_CALL getSingletonName_static(); - static OUString SAL_CALL getServiceName_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 4dc345f6b7fd..ca2aa0da4228 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -250,13 +250,6 @@ OfficeInstallationDirectories::getSupportedServiceNames_static() // static -OUString SAL_CALL OfficeInstallationDirectories::getSingletonName_static() -{ - return OUString("com.sun.star.util.theOfficeInstallationDirectories"); -} - - -// static uno::Reference< uno::XInterface > SAL_CALL OfficeInstallationDirectories::Create( const uno::Reference< uno::XComponentContext > & rxContext ) diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index f5c3267e49af..40c3fd0c41a6 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -77,8 +77,6 @@ public: getImplementationName_static(); static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static OUString SAL_CALL - getSingletonName_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& ); diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx index 3a9209b69b2b..8df33265a2ab 100644 --- a/compilerplugins/clang/unusedmethods.cxx +++ b/compilerplugins/clang/unusedmethods.cxx @@ -255,7 +255,7 @@ bool UnusedMethods::VisitFunctionDecl( const FunctionDecl* functionDecl ) return true; } - if( !ignoreLocation( functionDecl )) + if( functionDecl->getLocation().isValid() && !ignoreLocation( functionDecl )) definitionSet.insert(niceName(functionDecl)); return true; } diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index 6812c25ff7c1..dc5368b48b7e 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -182,10 +182,6 @@ public: // XDataDescriptorFactory }; -void copyProperties( - ReflectionBase *target, - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & source ); - } diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index f9b3d43da6ff..1b684439fc7e 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -104,8 +104,6 @@ private: OUString m_aCommands; DECL_LINK_TYPED(BrowseHdl, Button*, void); - OUString GetPlugInFile() const { return m_pEdFileurl->GetText(); } - OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); } public: SvInsertPlugInDialog(vcl::Window* pParent, diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 3b0c7d769455..5f5958be9da1 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -62,7 +62,6 @@ #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <vcl/svapp.hxx> -#include <vcl/svpforlokit.hxx> #include <tools/resmgr.hxx> #include <tools/fract.hxx> #include <svtools/ctrltool.hxx> diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index b17fbb66a31e..44008a227eea 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -273,45 +273,6 @@ namespace drawinglayer return true; } - // concatenate sequence - void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource) - { - if(rSource.hasElements()) - { - if(rDest.hasElements()) - { - const sal_Int32 nSourceCount(rSource.getLength()); - const sal_Int32 nDestCount(rDest.getLength()); - const sal_Int32 nTargetCount(nSourceCount + nDestCount); - sal_Int32 nInsertPos(nDestCount); - - rDest.realloc(nTargetCount); - - for(sal_Int32 a(0L); a < nSourceCount; a++) - { - if(rSource[a].is()) - { - rDest[nInsertPos++] = rSource[a]; - } - } - - if(nInsertPos != nTargetCount) - { - rDest.realloc(nInsertPos); - } - } - else - { - rDest = rSource; - } - } - } - - void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DContainer& rSource) - { - appendPrimitive2DSequenceToPrimitive2DSequence(rDest, comphelper::containerToSequence(rSource)); - } - void Primitive2DContainer::append(const Primitive2DContainer& rSource) { insert(end(), rSource.begin(), rSource.end()); @@ -332,17 +293,6 @@ namespace drawinglayer std::copy(rSource.begin(), rSource.end(), std::back_inserter(*this)); } - // concatenate single Primitive2D - void appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource) - { - if(rSource.is()) - { - const sal_Int32 nDestCount(rDest.getLength()); - rDest.realloc(nDestCount + 1L); - rDest[nDestCount] = rSource; - } - } - OUString idToString(sal_uInt32 nId) { switch( nId ) diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx index 1998a74deee2..460883a13955 100644 --- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx @@ -184,38 +184,6 @@ namespace drawinglayer return (pA->operator==(*pB)); } - bool arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB) - { - const bool bAHasElements(rA.hasElements()); - - if(bAHasElements != rB.hasElements()) - { - return false; - } - - if(!bAHasElements) - { - return true; - } - - const sal_Int32 nCount(rA.getLength()); - - if(nCount != rB.getLength()) - { - return false; - } - - for(sal_Int32 a(0L); a < nCount; a++) - { - if(!arePrimitive3DReferencesEqual(rA[a], rB[a])) - { - return false; - } - } - - return true; - } - bool Primitive3DContainer::operator==(const Primitive3DContainer& rB) const { const bool bAHasElements(!empty()); @@ -263,17 +231,6 @@ namespace drawinglayer } } - // concatenate single Primitive3D - void appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource) - { - if(rSource.is()) - { - const sal_Int32 nDestCount(rDest.getLength()); - rDest.realloc(nDestCount + 1L); - rDest[nDestCount] = rSource; - } - } - } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 67a553c4ce37..2bec201ff394 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -67,7 +67,6 @@ namespace framework private: void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); - OUString RetrieveLabelFromCommand(const OUString& rCmdURL); void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId ); }; } diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 1d6c70a103e3..e3ad1e583585 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -107,7 +107,6 @@ public: static void WriteStars( SvStream & ); virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr ); - const SvHelpContext& GetHelpContext() const { return aHelpContext; } virtual const SvString & GetName() const { return aName; } virtual const SvString & GetHelpText() const { return aHelpText; } virtual const SvString & GetConfigName() const{ return aConfigName; } diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx index 33f9060c3909..67119cf914b8 100644 --- a/include/canvas/canvastools.hxx +++ b/include/canvas/canvastools.hxx @@ -102,9 +102,6 @@ namespace canvas * */ - // mickey's math tricks... - inline unsigned int pow2( unsigned int c ) { return 0x1 << c; } - /** Round given floating point value down to next integer */ inline sal_Int32 roundDown( const double& rVal ) diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx index 8541d0d482f0..82be8db33ca6 100644 --- a/include/comphelper/accimplaccess.hxx +++ b/include/comphelper/accimplaccess.hxx @@ -75,10 +75,6 @@ namespace comphelper */ sal_Int64 implGetForeignControlledStates( ) const; - /// sets the accessible parent component - void setAccessibleParent( - const css::uno::Reference< css::accessibility::XAccessible >& _rxAccParent ); - protected: OAccessibleImplementationAccess( ); virtual ~OAccessibleImplementationAccess( ); @@ -87,34 +83,6 @@ namespace comphelper virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& _rIdentifier ) throw (css::uno::RuntimeException, std::exception) override; public: - /** tries to access the implementation of an OAccessibleImplementationAccess derivee which is known as - interface only. - - @param _rxComponent - is the component which should be examined. - @return - the pointer to the implementation, if successful. The only known error condition so far - is an invalid context (which means it is <NULL/>, or the implementation is not derived - from OAccessibleImplementationAccess, or retrieving the implementation failed). - */ - static OAccessibleImplementationAccess* getImplementation( - const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxComponent - ); - - /** sets the parent for a derived implementation - - @param _rxComponent - is the component which's new parent should be set - @param _rxNewParent - is the new parent of the component - @return - <TRUE/> in case of success, <FALSE/> otherwise. For error condition please look at - <method>getImplementation</method>. - */ - static bool setAccessibleParent( - const css::uno::Reference< css::accessibility::XAccessibleContext >& _rxComponent, - const css::uno::Reference< css::accessibility::XAccessible >& _rxNewParent - ); private: COMPHELPER_DLLPRIVATE static const css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index c2974215be8d..f8f30b6cb6bf 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -282,9 +282,6 @@ namespace drawinglayer { namespace primitive2d { - /// support to handle a sequence of primitives as stl vector and convert it during creation - Primitive2DSequence DRAWINGLAYER_DLLPUBLIC Primitive2DVectorToPrimitive2DSequence(const Primitive2DContainer& rSource, bool bInvert = false); - /// get B2DRange from a given Primitive2DReference basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation); @@ -296,13 +293,6 @@ namespace drawinglayer /// compare two Primitive2DReferences for equality, uses arePrimitive2DReferencesEqual internally bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB); - /// concatenate sequence - void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource); - void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DContainer& rSource); - - /// concatenate single Primitive2D - void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource); - OUString DRAWINGLAYER_DLLPUBLIC idToString(sal_uInt32 nId); } // end of namespace primitive2d diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index fe6b5a1fa102..79c7efe779e0 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -64,7 +64,6 @@ namespace drawinglayer { namespace primitive3d { Primitive3DContainer( std::initializer_list<Primitive3DReference> init ) : vector(init) {} void append(const Primitive3DContainer& rSource); - void append(const Primitive3DSequence& rSource); void append(Primitive3DContainer&& rSource); Primitive3DContainer& operator=(const Primitive3DContainer& r) { vector::operator=(r); return *this; } Primitive3DContainer& operator=(const Primitive3DContainer&& r) { vector::operator=(r); return *this; } @@ -209,15 +208,6 @@ namespace drawinglayer */ bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB); - /// compare two Primitive3DReferences for equality, uses arePrimitive3DReferencesEqual internally - bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB); - - /// concatenate sequence - void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DSequenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DContainer& rSource); - - /// concatenate single Primitive3D - void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource); - } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index 497bb0029166..311eefa0b290 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -75,13 +75,6 @@ public: void parseStream( StorageBase& rStorage, const OUString& rStreamName, bool bCloseStream = false ) throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException ); - OUString getNamespaceURL( const OUString& rPrefix ) - throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); - - bool hasNamespaceURL( const OUString& rPrefix ) const; - - sal_Int32 getNamespaceId( const OUString& aUrl ); - css::uno::Reference< css::xml::sax::XFastTokenHandler > getTokenHandler() const { return mxTokenHandler; } diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index a93a50802e0d..6dc4c3b83e99 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -220,12 +220,6 @@ public: */ XmlFilterBase& exportDocumentProperties( css::uno::Reference< css::document::XDocumentProperties > xProperties ); - OUString getNamespaceURL( const OUString& rPrefix ); - - bool hasNamespaceURL( const OUString& rPrefix ) const; - - sal_Int32 getNamespaceId( const OUString& rUrl ); - void importDocumentProperties(); FastParser* createParser() const; diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 79603bb1b2aa..ebae6747d3f0 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -44,31 +44,6 @@ namespace sfx2 */ void SetTitle( const OUString& i_rTitle ); - /** adds a drop down item to the toolbox. Usually, this is used to add some kind of menu to the toolbox. - - @param i_rItemText - the text to display for the item - @param i_nHelpId - the help ID for the new toolbox item - @param i_rCallback - the callback to invoke when the drop item has been clicked - @return - the ID of the newly created toolbox item - */ - sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback ) - { - return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback ); - } - - void SetEndDockingHdl( const Link<TitledDockingWindow*,void>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; } - - /** resets the toolbox. Upon return, the only item in the toolbox is the closer. - */ - void ResetToolBox() - { - impl_resetToolBox(); - } - /** returns the content window, which is to be used as parent window for any content to be displayed in the docking window. */ @@ -100,10 +75,6 @@ namespace sfx2 */ void impl_resetToolBox(); - /** internal version of AddDropDownToolBoxItem - */ - sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback ); - /** returns the current title. If no title has been set via SetTitle, then the window text (Window::GetText) is returned. diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index 21156c886008..cea8abce74c0 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -37,7 +37,6 @@ public: SfxIntegerListItem( const SfxIntegerListItem& rItem ); virtual ~SfxIntegerListItem(); - std::vector< sal_Int32 >& GetList() { return m_aList; } const std::vector< sal_Int32 >& GetList() const { return m_aList; } virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx index 78d5c676fca3..171d38deab44 100644 --- a/include/svl/ownlist.hxx +++ b/include/svl/ownlist.hxx @@ -74,9 +74,6 @@ public: return aCommandList[ i ]; } - void clear() { - aCommandList.clear(); - } }; #endif // INCLUDED_SVL_OWNLIST_HXX diff --git a/include/tools/appendunixshellword.hxx b/include/tools/appendunixshellword.hxx deleted file mode 100644 index dbe66c628851..000000000000 --- a/include/tools/appendunixshellword.hxx +++ /dev/null @@ -1,47 +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_APPENDUNIXSHELLWORD_HXX -#define INCLUDED_TOOLS_APPENDUNIXSHELLWORD_HXX - -#include <rtl/strbuf.hxx> - -#if defined UNX -#include <tools/toolsdllapi.h> - - -namespace tools { - -/** append arbitrary bytes as a properly quoted Unix-style shell word - - @param accumulator - the string buffer to which the word is appended (without any surrounding - whitespace); must not be null - @param text - the text to add -*/ -TOOLS_DLLPUBLIC void appendUnixShellWord( - OStringBuffer * accumulator, OString const & text); - -} -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 4cd4e6daad7f..4ea4dc79acaa 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -324,7 +324,6 @@ public: /// Move the top and left edges by a delta, preserving width and height inline void Move( long nHorzMoveDelta, long nVertMoveDelta ); - inline void Transpose(); inline void SetPos( const Point& rPoint ); void SetSize( const Size& rSize ); inline Size GetSize() const; @@ -497,20 +496,6 @@ inline void Rectangle::Move( long nHorzMove, long nVertMove ) nBottom += nVertMove; } -void Rectangle::Transpose() -{ - if ( !IsEmpty() ) - { - long swap( nLeft ); - nLeft = nTop; - nTop = swap; - - swap = nRight; - nRight = nBottom; - nBottom = swap; - } -} - inline void Rectangle::SetPos( const Point& rPoint ) { if ( nRight != RECT_EMPTY ) diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 9fcde9f4a602..573c89e97292 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -86,9 +86,6 @@ namespace utl /// returns the local name of the node OUString getLocalName() const; - /// returns the fully qualified path of the node - OUString getNodePath() const; - /** open a sub node @param _rPath access path of the to-be-opened sub node. May be a hierarchical path. */ diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index c49b4f0e0048..729dd5e58e4e 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -728,7 +728,6 @@ public: SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const; SAL_DLLPRIVATE bool ImplScaleFast( const double& rScaleX, const double& rScaleY ); SAL_DLLPRIVATE bool ImplScaleInterpolate( const double& rScaleX, const double& rScaleY ); - SAL_DLLPRIVATE bool ImplScaleConvolution( const double& rScaleX, const double& rScaleY, const vcl::Kernel& rKernel); SAL_DLLPRIVATE bool ImplConvolutionPass( Bitmap& aNewBitmap, diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 074200abea69..1b6cc1f34dff 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -106,19 +106,6 @@ public: static void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox); static void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition); - /// Get label of the command (like of .uno:Save) from the description service - static OUString getCommandProperty(const OUString& rProperty, const OUString& rCommand, - const css::uno::Reference<css::uno::XComponentContext>& rContext, - const OUString& rModuleId); - - /// Get image of the command (like of .uno:Save) from the description service - static Image getCommandImage( - const OUString& rCommand, - bool bLarge, - const css::uno::Reference<css::uno::XComponentContext>& rContext, - const css::uno::Reference<css::frame::XFrame>& rFrame, - const OUString& rModuleId ); - css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; } private: diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 52ef5d0099e6..d744bfbe15fa 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -195,11 +195,6 @@ public: return mbInitialized; } - bool requestedLegacy() - { - return mbRequestLegacyContext; - } - /// VCL promiscuously re-uses its own contexts: void setVCLOnly() { mbVCLOnly = true; } bool isVCLOnly() { return mbVCLOnly; } diff --git a/include/vcl/svpforlokit.hxx b/include/vcl/svpforlokit.hxx deleted file mode 100644 index 0b8477afe2f2..000000000000 --- a/include/vcl/svpforlokit.hxx +++ /dev/null @@ -1,26 +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/. - */ - -#ifndef INCLUDED_VCL_SVPFORLOKIT_HXX -#define INCLUDED_VCL_SVPFORLOKIT_HXX - -#include <vcl/virdev.hxx> -#include <vcl/dllapi.h> - -// These functions are for use by LibreOfficeKit only, I think - -class SalFrame; - -VCL_DLLPUBLIC void InitSvpForLibreOfficeKit(); -VCL_DLLPUBLIC SalFrame* GetSvpFocusFrameForLibreOfficeKit(); -VCL_DLLPUBLIC vcl::Window* GetSalFrameWindowForLibreOfficeKit(SalFrame *pSF); - -#endif // INCLUDED_VCL_SVPFORLOKIT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index d962ffa4a5b1..52562870f9b4 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -571,35 +571,6 @@ void OConnection::disposing() OConnection_BASE::disposing(); } -/* ToDo - upcast the connection to MySQL_Connection and use ::getSessionVariable() */ - -rtl::OUString OConnection::getMysqlVariable(const char *varname) - throw(SQLException, RuntimeException) -{ - OSL_TRACE("OConnection::getMysqlVariable"); - MutexGuard aGuard(m_aMutex); - checkDisposed(OConnection_BASE::rBHelper.bDisposed); - - rtl::OUString ret; - rtl::OUStringBuffer aStatement; - aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" ); - aStatement.appendAscii( varname ); - aStatement.append( '\'' ); - - try { - XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement()); - Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() ); - if (rs.is() && rs->next()) { - Reference< XRow > xRow(rs, UNO_QUERY); - ret = xRow->getString(2); - } - } catch (const sql::SQLException & e) { - mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); - } - - return ret; -} - sal_Int32 OConnection::getMysqlVersion() throw(SQLException, RuntimeException) { diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index ea1f8c39a0e9..78ccd0d3d97d 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -112,9 +112,6 @@ namespace connectivity bool m_bUseCatalog; // should we use the catalog on filebased databases public: - rtl::OUString getMysqlVariable(const char *varname) - throw(SQLException, RuntimeException); - sal_Int32 getMysqlVersion() throw(SQLException, RuntimeException); @@ -215,9 +212,7 @@ namespace connectivity // should we use the catalog on filebased databases inline bool isCatalogUsed() const { return m_bUseCatalog; } - inline rtl::OUString getUserName() const { return m_sUser; } inline const MysqlCDriver& getDriver() const { return m_rDriver;} - inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; } }; /* OConnection */ // TODO: Not used. diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index f7a49cfbe79c..03311f4f936f 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -97,38 +97,6 @@ ODatabaseMetaData::~ODatabaseMetaData() OSL_TRACE("ODatabaseMetaData::~ODatabaseMetaData"); } -rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ) -{ - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); - rtl::OUString stringMetaData; - try { - stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); - } catch (const sql::MethodNotImplementedException &) { - mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (const sql::InvalidArgumentException &) { - mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); - } catch (const sql::SQLException& e) { - mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); - } - return stringMetaData; -} - -rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ) -{ - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); - rtl::OUString stringMetaData; - try { - stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); - } catch (const sql::MethodNotImplementedException &) { - mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (const sql::InvalidArgumentException &) { - mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); - } catch (const sql::SQLException& e) { - mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); - } - return stringMetaData; -} - rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ) { OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 687039d96f69..531ba50ff283 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -49,8 +49,6 @@ namespace connectivity bool identifier_quote_string_set; private: - rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ); - rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ); rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ); rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() ); sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() ); diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx index 6290eb7e7ffa..5465577842ed 100644 --- a/oox/source/core/fastparser.cxx +++ b/oox/source/core/fastparser.cxx @@ -131,39 +131,6 @@ void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName parseStream( rStorage.openInputStream( rStreamName ), rStreamName, bCloseStream ); } -OUString FastParser::getNamespaceURL( const OUString& rPrefix ) throw( IllegalArgumentException, RuntimeException ) -{ - if( !mxParser.is() ) - throw RuntimeException(); - return mxParser->getNamespaceURL( rPrefix ); -} - -bool FastParser::hasNamespaceURL( const OUString& rPrefix ) const -{ - if (!mxParser.is()) - throw RuntimeException(); - - if (!mpParser) - return false; - - return mpParser->hasNamespaceURL(rPrefix); -} - -sal_Int32 FastParser::getNamespaceId( const OUString& rUrl ) -{ - for( NamespaceMap::const_iterator aIt = mrNamespaceMap.maTransitionalNamespaceMap.begin(), - aEnd = mrNamespaceMap.maTransitionalNamespaceMap.end(); aIt != aEnd; ++aIt ) - if( rUrl == aIt->second ) - return aIt->first; - - for( NamespaceMap::const_iterator aIt = mrNamespaceMap.maStrictNamespaceMap.begin(), - aEnd = mrNamespaceMap.maStrictNamespaceMap.end(); aIt != aEnd; ++aIt ) - if( rUrl == aIt->second ) - return aIt->first; - - return 0; -} - } // namespace core } // namespace oox diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 709c627db722..ea1721d46f12 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -364,21 +364,6 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan return false; } -OUString XmlFilterBase::getNamespaceURL( const OUString& rPrefix ) -{ - return mxImpl->maFastParser.getNamespaceURL( rPrefix ); -} - -bool XmlFilterBase::hasNamespaceURL( const OUString& rPrefix ) const -{ - return mxImpl->maFastParser.hasNamespaceURL(rPrefix); -} - -sal_Int32 XmlFilterBase::getNamespaceId( const OUString& rUrl ) -{ - return mxImpl->maFastParser.getNamespaceId( rUrl ); -} - Reference<XDocument> XmlFilterBase::importFragment( const OUString& aFragmentPath ) { Reference<XDocument> xRet; diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 6e262b2eb22f..4ac560fa835b 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -946,54 +946,6 @@ RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName, -// saveKey - -RegError ORegistry::saveKey(RegKeyHandle hKey, const OUString& regFileName, - bool bWarnings, bool bReport) -{ - ORegKey* pKey = static_cast< ORegKey* >(hKey); - - std::unique_ptr< ORegistry > pReg (new ORegistry()); - RegError _ret = pReg->initRegistry(regFileName, RegAccessMode::READWRITE, true/*bCreate*/); - if (_ret != RegError::NO_ERROR) - return _ret; - ORegKey* pRootKey = pReg->getRootKey(); - - REG_GUARD(m_mutex); - - OStoreDirectory::iterator iter; - OStoreDirectory rStoreDir(pKey->getStoreDir()); - storeError _err = rStoreDir.first(iter); - - while ( _err == store_E_None ) - { - OUString const keyName = iter.m_pszName; - - if ( iter.m_nAttrib & STORE_ATTRIB_ISDIR ) - { - _ret = loadAndSaveKeys(pRootKey, pKey, keyName, - pKey->getName().getLength(), - bWarnings, bReport); - } - else - { - _ret = loadAndSaveValue(pRootKey, pKey, keyName, - pKey->getName().getLength(), - bWarnings, bReport); - } - - if (_ret != RegError::NO_ERROR) - break; - - _err = rStoreDir.next(iter); - } - - (void) pReg->releaseKey(pRootKey); - return _ret; -} - - - // loadAndSaveValue() RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index eb1d8e099aff..cea37bf9b983 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -80,11 +80,6 @@ public: bool bWarings=false, bool bReport=false); - RegError saveKey(RegKeyHandle hKey, - const OUString& regFileName, - bool bWarings=false, - bool bReport=false); - RegError dumpRegistry(RegKeyHandle hKey) const; ~ORegistry(); diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 52024fda3998..3fa7e27a1e7a 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -43,8 +43,6 @@ class SvxFieldItem; class ScAccessibleEditObject; class ScEditWindow; -SC_DLLPUBLIC ScEditWindow* GetScEditWindow (); - enum ScEditWindowLocation { Left, diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx index eb31d0c6f7a9..b51ad3993876 100644 --- a/sd/inc/TransitionPreset.hxx +++ b/sd/inc/TransitionPreset.hxx @@ -54,7 +54,6 @@ public: sal_Int32 getFadeColor() const { return mnFadeColor; } const OUString& getPresetId() const { return maPresetId; } - const OUString& getGroupId() const { return maGroupId; } const OUString& getSetId() const { return maSetId; } const OUString& getSetLabel() const { return maSetLabel; } const OUString& getVariantLabel() const { return maVariantLabel; } diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index a7d60976ad14..2427a5cd6f8b 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -371,7 +371,6 @@ public: void addAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, int nIndex = -1 ); void removeAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation ); const sd::AnnotationVector& getAnnotations() const { return maAnnotations; } - sal_Int32 getHash() const; OString stringify() const; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index b165f9533de0..f4c09ced768d 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -577,11 +577,6 @@ OString SdPage::stringify() const return aString.makeStringAndClear(); } -sal_Int32 SdPage::getHash() const -{ - return stringify().hashCode(); -} - void SdPage::createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation ) { sd::createAnnotation( xAnnotation, this ); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 22af458a4d8e..0a8ac0d67d2d 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -234,25 +234,6 @@ namespace sfx2 } - sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<ToolBox *, void>& i_rCallback ) - { - // Add the menu before the closer button. - const sal_uInt16 nItemCount( m_aToolbox->GetItemCount() ); - const sal_uInt16 nItemId( nItemCount + 1 ); - m_aToolbox->InsertItem( nItemId, i_rItemText, ToolBoxItemBits::DROPDOWNONLY, nItemCount > 0 ? nItemCount - 1 : TOOLBOX_APPEND ); - m_aToolbox->SetHelpId( nItemId, i_nHelpId ); - m_aToolbox->SetClickHdl( i_rCallback ); - m_aToolbox->SetDropdownClickHdl( i_rCallback ); - - // The tool box has likely changed its size. The title bar has to be - // resized. - impl_scheduleLayout(); - Invalidate(); - - return nItemId; - } - - IMPL_LINK_TYPED( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox, void ) { const sal_uInt16 nId = pToolBox->GetCurItemId(); diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index 47c107400c18..4f9f317881a4 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -131,12 +131,10 @@ public: void SetUpperLeftCorner( const Point& rNew ); void SetUpperRightCorner( const Point& rNew ); void SetLowerLeftCorner( const Point& rNew ); - const Size _Size() const; const Point TopLeft() const; const Point TopRight() const; const Point BottomLeft() const; const Point BottomRight() const; - const Size SwappedSize() const; long GetLeftDistance( long ) const; long GetBottomDistance( long ) const; long GetRightDistance( long ) const; diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx index fa3bfcd70daa..ed0a7d83df1d 100644 --- a/sw/source/core/bastyp/swrect.cxx +++ b/sw/source/core/bastyp/swrect.cxx @@ -173,9 +173,6 @@ void SwRect::AddBottom( const long nAdd ){ m_Size.Height() += nAdd; } void SwRect::SetPosX( const long nNew ){ m_Point.setX(nNew); } void SwRect::SetPosY( const long nNew ){ m_Point.setY(nNew); } -const Size SwRect::_Size() const { return SSize(); } -const Size SwRect::SwappedSize() const { return Size( m_Size.getHeight(), m_Size.getWidth() ); } - const Point SwRect::TopLeft() const { return Pos(); } const Point SwRect::TopRight() const { return Point( m_Point.getX() + m_Size.getWidth(), m_Point.getY() ); } const Point SwRect::BottomLeft() const { return Point( m_Point.getX(), m_Point.getY() + m_Size.getHeight() ); } diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 65ba17c63303..2bca4a53424e 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/memtools/mempool \ tools/source/memtools/multisel \ tools/source/memtools/unqidx \ - tools/source/misc/appendunixshellword \ tools/source/misc/cpuid \ tools/source/misc/extendapplicationenvironment \ tools/source/misc/getprocessworkingdir \ diff --git a/tools/source/misc/appendunixshellword.cxx b/tools/source/misc/appendunixshellword.cxx deleted file mode 100644 index bce043c93952..000000000000 --- a/tools/source/misc/appendunixshellword.cxx +++ /dev/null @@ -1,69 +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 . - */ - -#include <sal/config.h> - -#if defined UNX - -#include <cstddef> - -#include <osl/diagnose.h> -#include <rtl/strbuf.hxx> -#include <rtl/string.h> -#include <rtl/string.hxx> -#include <sal/types.h> -#include <tools/appendunixshellword.hxx> - -namespace tools { - -void appendUnixShellWord( - OStringBuffer * accumulator, OString const & text) -{ - OSL_ASSERT(accumulator != nullptr); - if (text.isEmpty()) { - accumulator->append("''"); - } else { - bool quoted = false; - for (sal_Int32 i = 0; i < text.getLength(); ++i) { - char c = text[i]; - if (c == '\'') { - if (quoted) { - accumulator->append('\''); - quoted = false; - } - accumulator->append("\\'"); - } else { - if (!quoted) { - accumulator->append('\''); - quoted = true; - } - accumulator->append(c); - } - } - if (quoted) { - accumulator->append('\''); - } - } -} - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 847dbc9434f4..e1b31cc0db76 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -132,21 +132,6 @@ namespace utl return sLocalName; } - OUString OConfigurationNode::getNodePath() const - { - OUString sNodePath; - try - { - Reference< XHierarchicalName > xNamed( m_xDirectAccess, UNO_QUERY_THROW ); - sNodePath = xNamed->getHierarchicalName(); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - return sNodePath; - } - OUString OConfigurationNode::normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const { OUString sName(_rName); diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 4a48abbe6915..609db130fcaf 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -18,7 +18,6 @@ */ #include <string.h> -#include <vcl/svpforlokit.hxx> #include <vcl/syswin.hxx> #include "headless/svpframe.hxx" @@ -489,14 +488,4 @@ void SvpSalFrame::EndSetClipRegion() { } -SalFrame* GetSvpFocusFrameForLibreOfficeKit() -{ - return SvpSalFrame::GetFocusFrame(); -} - -vcl::Window* GetSalFrameWindowForLibreOfficeKit(SalFrame *pSF) -{ - return pSF->GetWindow(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index 6eb0a114ca32..0273f3f7311c 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -19,8 +19,6 @@ #ifndef IOS -#include <vcl/svpforlokit.hxx> - #include "headless/svpbmp.hxx" #include "headless/svpinst.hxx" #include "headless/svpvd.hxx" @@ -56,36 +54,32 @@ bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY ) } bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, - const basebmp::RawMemorySharedArray &pBuffer ) + const basebmp::RawMemorySharedArray &pBuffer ) { B2IVector aDevSize( nNewDX, nNewDY ); if( aDevSize.getX() == 0 ) aDevSize.setX( 1 ); if( aDevSize.getY() == 0 ) aDevSize.setY( 1 ); - if( ! m_aDevice.get() || m_aDevice->getSize() != aDevSize ) - { + if( ! m_aDevice.get() || m_aDevice->getSize() != aDevSize ) { basebmp::Format nFormat = SvpSalInstance::getBaseBmpFormatForDeviceFormat(m_eFormat); - if (m_eFormat == DeviceFormat::BITMASK) - { + if (m_eFormat == DeviceFormat::BITMASK) { std::vector< basebmp::Color > aDevPal(2); aDevPal[0] = basebmp::Color( 0, 0, 0 ); aDevPal[1] = basebmp::Color( 0xff, 0xff, 0xff ); m_aDevice = createBitmapDevice( aDevSize, true, nFormat, PaletteMemorySharedVector( new std::vector< basebmp::Color >(aDevPal) ) ); - } - else - { + } else { m_aDevice = pBuffer ? - createBitmapDevice( aDevSize, true, nFormat, pBuffer, PaletteMemorySharedVector() ) + createBitmapDevice( aDevSize, true, nFormat, pBuffer, PaletteMemorySharedVector() ) : createBitmapDevice( aDevSize, true, nFormat ); } // update device in existing graphics for( std::list< SvpSalGraphics* >::iterator it = m_aGraphics.begin(); it != m_aGraphics.end(); ++it ) - (*it)->setDevice( m_aDevice ); + (*it)->setDevice( m_aDevice ); } return true; diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx index 6b519274e808..4f8d1bccf42a 100644 --- a/vcl/inc/cairotextrender.hxx +++ b/vcl/inc/cairotextrender.hxx @@ -130,7 +130,6 @@ public: #if ENABLE_CAIRO_CANVAS virtual SystemFontData GetSysFontData( int nFallbackLevel ) const override; #endif - SalColor GetTextColor() const { return mnTextColor; } }; #endif diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index c338bb33b8db..507af74777d6 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -131,8 +131,6 @@ public: virtual void SetScreenNumber( unsigned int nScreen ) override { (void)nScreen; } virtual void SetApplicationID(const OUString &rApplicationID) override { (void) rApplicationID; } - static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; } - }; #endif // INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx index e11f71efa7f8..821a649d0e7a 100644 --- a/vcl/inc/opengl/texture.hxx +++ b/vcl/inc/opengl/texture.hxx @@ -113,7 +113,6 @@ public: void Unbind(); void Read( GLenum nFormat, GLenum nType, sal_uInt8* pData ); GLuint AddStencil(); - bool HasStencil() const; GLuint StencilId() const; void SaveToFile(const OUString& rFileName); diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx index bf4aa1d5e7bd..f2439a12478c 100644 --- a/vcl/opengl/texture.cxx +++ b/vcl/opengl/texture.cxx @@ -299,11 +299,6 @@ int OpenGLTexture::GetHeight() const return maRect.GetHeight(); } -bool OpenGLTexture::HasStencil() const -{ - return mpImpl && mpImpl->mnOptStencil != 0; -} - GLuint OpenGLTexture::StencilId() const { return mpImpl ? mpImpl->mnOptStencil : 0; diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx index bfcdb2e367a8..2a8dd90c0669 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx @@ -30,21 +30,6 @@ using namespace com::sun::star::io; using namespace chelp; -Reference<XInputStream> chelp::turnToSeekable(const Reference<XInputStream>& xInputStream) -{ - if( ! xInputStream.is() ) - return xInputStream; - - Reference<XSeekable> xSeekable(xInputStream,UNO_QUERY); - - if( xSeekable.is() ) - return xInputStream; - - return new BufferedInputStream(xInputStream); -} - - - BufferedInputStream::BufferedInputStream(const Reference<XInputStream>& xInputStream) : m_nBufferLocation(0), m_nBufferSize(0), diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx index 3cead43f76d6..643d4099eb93 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx @@ -100,11 +100,6 @@ namespace chelp { css::uno::RuntimeException, std::exception ) override; }; - - extern css::uno::Reference<css::io::XInputStream> - turnToSeekable( - const css::uno::Reference<css::io::XInputStream>& xInputStream); - } #endif // INCLUDED_XMLHELP_SOURCE_CXXHELP_PROVIDER_BUFFEREDINPUTSTREAM_HXX |