diff options
-rw-r--r-- | autodoc/inc/ary/idl/i_namelookup.hxx | 1 | ||||
-rw-r--r-- | autodoc/inc/ary/itrange.hxx | 74 | ||||
-rw-r--r-- | basic/source/inc/runtime.hxx | 13 | ||||
-rw-r--r-- | idl/inc/bastype.hxx | 51 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpobjfactory.cxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpoleobject.hxx | 51 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwptemp.hxx | 82 | ||||
-rw-r--r-- | sc/source/ui/inc/printfun.hxx | 14 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShellBase.hxx | 9 | ||||
-rw-r--r-- | sfx2/inc/sfx2/fcontnr.hxx | 11 | ||||
-rw-r--r-- | sfx2/source/inc/sfxtypes.hxx | 15 | ||||
-rw-r--r-- | svl/inc/svl/ondemand.hxx | 74 | ||||
-rw-r--r-- | sw/source/core/text/txtpaint.hxx | 31 |
13 files changed, 0 insertions, 427 deletions
diff --git a/autodoc/inc/ary/idl/i_namelookup.hxx b/autodoc/inc/ary/idl/i_namelookup.hxx index 9da313ea08cb..f962d48a0768 100644 --- a/autodoc/inc/ary/idl/i_namelookup.hxx +++ b/autodoc/inc/ary/idl/i_namelookup.hxx @@ -25,7 +25,6 @@ // USED SERVICES #include <ary/stdconstiter.hxx> -#include <ary/itrange.hxx> #include <vector> #include <map> diff --git a/autodoc/inc/ary/itrange.hxx b/autodoc/inc/ary/itrange.hxx deleted file mode 100644 index 2cda9b74bbc6..000000000000 --- a/autodoc/inc/ary/itrange.hxx +++ /dev/null @@ -1,74 +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 ARY_ITRANGE_HXX -#define ARY_ITRANGE_HXX -// KORR_DEPRECATED_3.0 - - -// USED SERVICES - // BASE CLASSES - // COMPONENTS - // PARAMETERS -#include <utility> - - - - -namespace ary -{ - -template <typename ITER> -class IteratorRange -{ - public: - IteratorRange( - ITER i_begin, - ITER i_end ) - : itCurrent(i_begin), - itEnd(i_end) - {} - IteratorRange( - std::pair<ITER,ITER> - i_range ) - : itCurrent(i_range.first), - itEnd(i_range.second) - {} - - operator bool() const { return itCurrent != itEnd; } - IteratorRange & operator++() { ++itCurrent; return *this; } - - ITER cur() const { return itCurrent; } - ITER end() const { return itEnd; } - - - private: - // DATA - ITER itCurrent; - ITER itEnd; -}; - - - - - -} // namespace ary -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 470b152a2cf9..1fe346deb1e1 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -39,19 +39,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::container; - -namespace basicEncoder -{ - -// TODO: Use exported functionality (code is copied from deamons2/ucb) -class AsciiEncoder -{ -public: - static ::rtl::OUString decodeUnoUrlParamValue(const rtl::OUString & rSource); -}; - -} - class SbiInstance; // active StarBASIC process class SbiRuntime; // active StarBASIC procedure instance diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index 15a83d16f772..787c3ca758a0 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -50,57 +50,6 @@ public: }; -class SvINT16 -{ - short nVal; -public: - SvINT16() { nVal = 0; } - SvINT16( short n ) : nVal( n ) {} - SvINT16 & operator = ( short n ) { nVal = n; return *this; } - - operator short &() { return nVal; } - - friend SvStream& operator << (SvStream & rStm, const SvINT16 & r ) - { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; } - friend SvStream& operator >> (SvStream & rStm, SvINT16 & r ) - { r.nVal = (short)SvUINT32::Read( rStm ); return rStm; } -}; - - -class SvUINT16 -{ - sal_uInt16 nVal; -public: - SvUINT16() { nVal = 0; } - SvUINT16( sal_uInt16 n ) : nVal( n ) {} - SvUINT16 & operator = ( sal_uInt16 n ) { nVal = n; return *this; } - - operator sal_uInt16 &() { return nVal; } - - friend SvStream& operator << (SvStream & rStm, const SvUINT16 & r ) - { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; } - friend SvStream& operator >> (SvStream & rStm, SvUINT16 & r ) - { r.nVal = (sal_uInt16)SvUINT32::Read( rStm ); return rStm; } -}; - - -class SvINT32 -{ - sal_Int32 nVal; -public: - SvINT32() { nVal = 0; } - SvINT32( sal_Int32 n ) : nVal( n ) {} - SvINT32 & operator = ( sal_Int32 n ) { nVal = n; return *this; } - - operator sal_Int32 &() { return nVal; } - - friend SvStream& operator << (SvStream & rStm, const SvINT32 & r ) - { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; } - friend SvStream& operator >> (SvStream & rStm, SvINT32 & r ) - { r.nVal = (sal_Int32)SvUINT32::Read( rStm ); return rStm; } -}; - - class Svint { int nVal; diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx index 616b11b246bb..f1dfa9abd9bf 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.cxx +++ b/lotuswordpro/source/filter/lwpobjfactory.cxx @@ -65,7 +65,6 @@ #include "lwpobjfactory.hxx" #include "lwpdefs.hxx" #include "lwpdoc.hxx" -#include "lwptemp.hxx" #include "lwpstory.hxx" #include "lwplayout.hxx" #include "lwppara.hxx" diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx index 2756fc8c2353..eec39f5d52cd 100644 --- a/lotuswordpro/source/filter/lwpoleobject.hxx +++ b/lotuswordpro/source/filter/lwpoleobject.hxx @@ -127,57 +127,6 @@ private: Rectangle m_SizeRect; }; -/** -* Added by for SODC_2667,03/20/2006 -* Read the OLE Object stream and get the info of the OLE picture -*/ -#include <tools/stream.hxx> -#include <vcl/gdimtf.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/outdev.hxx> -class LwpOlePres -{ - sal_uLong nFormat; - sal_uInt16 nAspect; - Bitmap * pBmp; - GDIMetaFile * pMtf; - - sal_uInt32 nAdvFlags; - sal_Int32 nJobLen; - sal_uInt8 * pJob; - Size aSize; // Groesse in 100TH_MM -public: - LwpOlePres( sal_uLong nF ) - : nFormat( nF ) - , pBmp( NULL ) - , pMtf( NULL ) - , nAdvFlags( 0x2 ) // in Dokument gefunden - , nJobLen( 0 ) - , pJob( NULL ) - {} - ~LwpOlePres() - { - delete [] pJob; - delete pBmp; - delete pMtf; - } - void SetMtf( const GDIMetaFile & rMtf ) - { - if( pMtf ) - delete pMtf; - pMtf = new GDIMetaFile( rMtf ); - } - Bitmap *GetBitmap() const { return pBmp; } - GDIMetaFile *GetMetaFile() const { return pMtf; } - sal_uLong GetFormat() const { return nFormat; } - void SetAspect( sal_uInt16 nAsp ) { nAspect = nAsp; } - sal_uLong GetAdviseFlags() const { return nAdvFlags; } - void SetAdviseFlags( sal_uLong nAdv ) { nAdvFlags = nAdv; } - void SetSize( const Size & rSize ) { aSize = rSize; } - Size GetSize() const { return aSize; } -}; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwptemp.hxx b/lotuswordpro/source/filter/lwptemp.hxx deleted file mode 100644 index 6019b5718dd8..000000000000 --- a/lotuswordpro/source/filter/lwptemp.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 - * - * Sun Microsystems Inc., October, 2000 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (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.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: IBM Corporation - * - * Copyright: 2008 by IBM Corporation - * - * All Rights Reserved. - * - * Contributor(s): _______________________________________ - * - * - ************************************************************************/ -#ifndef _LWPTEMPOBJ_HXX_ -#define _LWPTEMPOBJ_HXX_ - - -class LwpTempObject -{ -// friend class LwpObjectFactory; -public: - LwpTempObject(){} - ~LwpTempObject(){} - -/*protected: - LwpObjectHeader m_ObjHdr; - LwpObjectStream* m_pObjStrm; - LwpObjectStream m_TempObjStrm; - SvStream* m_pTempStrm; - -protected: - void QuickRead(); - virtual void Read(); -public: - LwpObjectID* GetObjectID(){ return m_ObjHdr.GetID();}*/ -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index 1c08b3585540..b44fa2a40620 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -78,20 +78,6 @@ struct ScPrintHFParam }; -// "Ersatz" fuer SV-JobSetup: - -class ScJobSetup -{ -public: - ScJobSetup( SfxPrinter* pPrinter ); - - Size aUserSize; - MapMode aUserMapMode; - Paper ePaper; - Orientation eOrientation; - sal_uInt16 nPaperBin; -}; - struct ScPrintState // Variablen aus ScPrintFunc retten { SCTAB nPrintTab; diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 4dbbbf9559f5..089368ab1542 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -260,15 +260,6 @@ private: ::rtl::OUString GetInitialViewShellType (void); }; -class ICustomhandleSupplier -{ -public: - virtual void addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList ) = 0; - -protected: - ~ICustomhandleSupplier() {} -}; - } // end of namespace sd #endif diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index d588771aae3a..bbccde13cfde 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -76,17 +76,6 @@ public: { pWindow = pWin; } }; -class SfxFrameWindowFactory -{ - typedef SfxFrameWindow* (*FactoryFunc)( SfxFrame* pParent, const String& rName ); - FactoryFunc pFunc; - String aName; -public: - SfxFrameWindowFactory( FactoryFunc pFuncP, String aNameP ); - String GetURLWildCard() { return aName; } - FactoryFunc GetFactory() { return pFunc; } -}; - typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont ); class SFX2_DLLPUBLIC SfxFilterContainer diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index cb1aced2f087..1ecb2750c198 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -136,21 +136,6 @@ struct StringList_Impl : private Resource }; -class SfxBoolResetter -{ - sal_Bool& _rVar; - sal_Bool _bOld; - -public: - SfxBoolResetter( sal_Bool &rVar ) - : _rVar( rVar ), - _bOld( rVar ) - {} - - ~SfxBoolResetter() - { _rVar = _bOld; } -}; - #define GPF() *(int*)0 = 0 #endif // #ifndef _SFX_SFXTYPES_HXX diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx index b3ce4988c825..d90314db286f 100644 --- a/svl/inc/svl/ondemand.hxx +++ b/svl/inc/svl/ondemand.hxx @@ -232,80 +232,6 @@ public: CalendarWrapper& operator*() { return *get(); } }; -/** Load a collator only if it's needed. - SvNumberformatter uses it upon switching locales. - @ATTENTION If the default ctor is used the init() method MUST be called - before accessing the collator. - */ -class OnDemandCollatorWrapper -{ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; - ::com::sun::star::lang::Locale aLocale; - mutable CollatorWrapper* pPtr; - mutable bool bValid; - bool bInitialized; - -public: - OnDemandCollatorWrapper() - : pPtr(0) - , bValid(false) - , bInitialized(false) - {} - OnDemandCollatorWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - ::com::sun::star::lang::Locale& rLocale - ) - : bValid(false) - , bInitialized(false) - { - init( rxSMgr, rLocale ); - } - ~OnDemandCollatorWrapper() - { - delete pPtr; - } - - bool isInitialized() const { return bInitialized; } - - bool is() const { return pPtr != NULL; } - - void init( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - ::com::sun::star::lang::Locale& rLocale - ) - { - xSMgr = rxSMgr; - changeLocale( rLocale ); - if ( pPtr ) - { - delete pPtr; - pPtr = NULL; - } - bInitialized = true; - } - - void changeLocale( ::com::sun::star::lang::Locale& rLocale ) - { - bValid = false; - aLocale = rLocale; - } - - const CollatorWrapper* get() const - { - if ( !bValid ) - { - if ( !pPtr ) - pPtr = new CollatorWrapper( xSMgr ); - pPtr->loadDefaultCollator( aLocale, ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ); - bValid = true; - } - return pPtr; - } - - const CollatorWrapper* operator->() const { return get(); } - const CollatorWrapper& operator*() const { return *get(); } -}; - /** Load a transliteration only if it's needed. SvNumberformatter uses it upon switching locales. @ATTENTION If the default ctor is used the init() method MUST be called diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index ad4f5795479d..aa466966c010 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -75,20 +75,6 @@ public: }; /************************************************************************* - * class DbgColor - *************************************************************************/ - -class DbgColor -{ - Font *pFnt; - Color aColor; -public: - inline DbgColor( Font *pFont, const sal_Bool bOn = sal_True, - const ColorData eColor = COL_BLUE ); - inline ~DbgColor(); -}; - -/************************************************************************* * class DbgBrush *************************************************************************/ @@ -122,23 +108,6 @@ inline SwDbgOut::SwDbgOut( OutputDevice* pOutDev, const sal_Bool bOn ) { } -inline DbgColor::DbgColor( Font *pFont, const sal_Bool bOn, - const ColorData eColor ) - :pFnt( bOn ? pFont : 0 ) -{ - if( pFnt ) - { - aColor = pFnt->GetColor(); - pFnt->SetColor( Color( eColor ) ); - } -} - -inline DbgColor::~DbgColor() -{ - if( pFnt ) - pFnt->SetColor( aColor ); -} - inline DbgBackColor::DbgBackColor( OutputDevice* pOutDev, const sal_Bool bOn, ColorData eColor ) :SwDbgOut( pOutDev, bOn ) |