connectivity/source/drivers/ado/Aolevariant.cxx | 4 editeng/inc/editeng/svxfont.hxx | 3 editeng/source/items/svxfont.cxx | 31 -- framework/inc/macros/debug.hxx | 8 framework/inc/macros/debug/timemeasure.hxx | 143 --------- framework/inc/services/layoutmanager.hxx | 6 framework/source/layoutmanager/layoutmanager.cxx | 14 np_sdk/inc/npapi.h | 7 offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/frame/LayoutManager.idl | 7 offapi/com/sun/star/frame/XInplaceLayout.idl | 68 ---- qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv | 2 qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java | 48 --- registry/inc/registry/registry.h | 29 - registry/source/regkey.cxx | 38 -- sal/osl/w32/file_dirvol.cxx | 1 sal/osl/w32/nlsupport.c | 18 - sal/osl/w32/pipe.c | 7 sal/osl/w32/profile.cxx | 148 ---------- sal/osl/w32/security.c | 5 sw/source/filter/xml/xmltexti.hxx | 1 unodevtools/source/skeletonmaker/javacompskeleton.cxx | 22 - unusedcode.easy | 1 vcl/generic/print/genpspgraphics.cxx | 5 vcl/inc/win/saldata.hxx | 1 vcl/win/source/gdi/salgdi2.cxx | 1 vcl/win/source/gdi/salgdi3.cxx | 40 -- vcl/win/source/gdi/salnativewidgets-luna.cxx | 7 xmloff/Package_inc.mk | 1 xmloff/inc/functional.hxx | 30 -- xmloff/inc/xmloff/txtimp.hxx | 3 xmloff/source/transform/MetaTContext.hxx | 5 32 files changed, 15 insertions(+), 690 deletions(-)
New commits: commit 5ca858c01cb2e2aa93c8aca65fd271a900785e3f Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 21:29:58 2012 +0100 offapi: remove obsolete XInplaceLayout diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 84931a3..9c9d545 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -161,12 +161,6 @@ namespace framework virtual sal_Bool SAL_CALL isVisible() throw (::com::sun::star::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // XInplaceLayout - //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL setInplaceMenuBar( sal_Int64 pInplaceMenuBarPointer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL resetInplaceMenuBar( ) throw (::com::sun::star::uno::RuntimeException); - - //--------------------------------------------------------------------------------------------------------- // XMenuBarMergingAcceptor //--------------------------------------------------------------------------------------------------------- virtual sal_Bool SAL_CALL setMergedMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar ) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 0020a2e..63a1569 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - // my own includes #include <services/layoutmanager.hxx> #include <helpers.hxx> @@ -34,7 +33,6 @@ #include <services.h> #include <framework/sfxhelperfunctions.hxx> -#include <framework/sfxhelperfunctions.hxx> #include <uielement/menubarwrapper.hxx> #include <framework/addonsoptions.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> @@ -1244,18 +1242,6 @@ throw (RuntimeException) implts_reset( sal_True ); } -void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 ) -throw (uno::RuntimeException) -{ - OSL_FAIL( "This method is obsolete and should not be used!\n" ); -} - -void SAL_CALL LayoutManager::resetInplaceMenuBar() -throw (uno::RuntimeException) -{ - OSL_FAIL( "This method is obsolete and should not be used!\n" ); -} - //--------------------------------------------------------------------------------------------------------- // XMenuBarMergingAcceptor //--------------------------------------------------------------------------------------------------------- diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1220adc..b5a696a 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2516,7 +2516,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XFrameSetModel \ XFrames \ XFramesSupplier \ - XInplaceLayout \ XInterceptorInfo \ XLayoutManager \ XLayoutManagerEventBroadcaster \ diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl index aee70e7..9e30376 100644 --- a/offapi/com/sun/star/frame/LayoutManager.idl +++ b/offapi/com/sun/star/frame/LayoutManager.idl @@ -32,7 +32,6 @@ #include <com/sun/star/frame/XLayoutManager.idl> #include <com/sun/star/frame/XFrameActionListener.idl> #include <com/sun/star/ui/XUIConfigurationListener.idl> -#include <com/sun/star/frame/XInplaceLayout.idl> #include <com/sun/star/beans/XPropertySet.idl> #include <com/sun/star/frame/XMenuBarMergingAcceptor.idl> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.idl> @@ -100,12 +99,6 @@ service LayoutManager */ [optional] interface ::com::sun::star::frame::XLayoutManagerEventBroadcaster; - /** interface to support settings a menu bar for inplace editing of - components inside OpenOffice.org. - - @deprecated - */ - [optional] interface ::com::sun::star::frame::XInplaceLayout; }; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl deleted file mode 100644 index aeeeadd..0000000 --- a/offapi/com/sun/star/frame/XInplaceLayout.idl +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __com_sun_star_frame_XInplaceLayout_idl__ -#define __com_sun_star_frame_XInplaceLayout_idl__ - -#include <com/sun/star/uno/XInterface.idl> - -//============================================================================= - -module com { module sun { module star { module frame { - -//============================================================================= - -/** special interface to support inplace editing of components inside - OpenOffice.org. - - @deprecated - - @since OOo 2.0 -*/ - -interface XInplaceLayout : com::sun::star::uno::XInterface -{ - /** sets an inplace menu to the container window of the attached frame. - - @param InplaceMenuBarPointer - must be a VCL menu bar pointer which is accessible within the - layout manager process. - */ - void setInplaceMenuBar( [in] hyper InplaceMenuBarPointer ); - - /** removes an inplace menu and sets back a previously created menu bar if one - has been set before. - */ - void resetInplaceMenuBar(); -}; - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv b/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv index af47fcb..f45c6bc 100755 --- a/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv +++ b/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv @@ -1,6 +1,4 @@ "LayoutManager";"com::sun::star::lang::XEventListener";"disposing()" -"LayoutManager";"com::sun::star::frame::XInplaceLayout#optional";"setInplaceMenuBar()" -"LayoutManager";"com::sun::star::frame::XInplaceLayout#optional";"resetInplaceMenuBar()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"attachFrame()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"reset()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"getCurrentDockingArea()" diff --git a/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java b/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java deleted file mode 100644 index 2d644d2..0000000 --- a/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package ifc.frame; - -import com.sun.star.frame.XInplaceLayout; -import lib.MultiMethodTest; - -public class _XInplaceLayout extends MultiMethodTest { - public XInplaceLayout oObj = null; - - public void _setInplaceMenuBar() { - log.print("This method exists for inplace editing with own modules. "); - log.println("It makes no sense to call it from Java."); -// oObj.setInplaceMenuBar(l); - tRes.tested("setInplaceMenuBar()", true); - } - - public void _resetInplaceMenuBar() { - requiredMethod("setInplaceMenuBar()"); - oObj.resetInplaceMenuBar(); - tRes.tested("resetInplaceMenuBar()", true); - } -} commit a8e35884d26c31cd449a9c615e612360b6c9ec50 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 21:12:20 2012 +0100 xmloff: use ::comphelper::UStringLess instead of less_functor diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 2107746..8b3b530 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -29,7 +29,6 @@ #define _XMLTEXTI_HXX #include <xmloff/txtimp.hxx> -#include <xmloff/functional.hxx> class XMLRedlineImportHelper; class SvXMLImport; diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk index 892ecdd..b53ea7e 100644 --- a/xmloff/Package_inc.mk +++ b/xmloff/Package_inc.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/families.hxx,xmloff/fami $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerexport.hxx,xmloff/formlayerexport.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formlayerimport.hxx,xmloff/formlayerimport.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/formsimp.hxx,xmloff/formsimp.hxx)) -$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/functional.hxx,xmloff/functional.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/i18nmap.hxx,xmloff/i18nmap.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/maptype.hxx,xmloff/maptype.hxx)) $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/nmspmap.hxx,xmloff/nmspmap.hxx)) diff --git a/xmloff/inc/functional.hxx b/xmloff/inc/functional.hxx deleted file mode 100644 index 6d27da0..0000000 --- a/xmloff/inc/functional.hxx +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#ifndef _XMLOFF_FUNCTIONAL_HXX -#define _XMLOFF_FUNCTIONAL_HXX - -#include <rtl/ustring.hxx> - -/* THIS HEADER IS DEPRECATED. USE comphelper/stl_types.hxx INSTEAD!!! */ - -/** @#file - * - * re-implement STL functors as needed - * - * The standard comparison operators from the STL cause warnings with - * several compilers about our sal_Bool (=unsigned char) being - * converted to bool (C++ bool). We wish to avoid that. - */ - -struct less_functor -{ - bool operator()(const ::rtl::OUString& x, - const ::rtl::OUString& y) const - { - return 0 != (x<y); - } -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx index 93a8ba2..f364402 100644 --- a/xmloff/inc/xmloff/txtimp.hxx +++ b/xmloff/inc/xmloff/txtimp.hxx @@ -39,9 +39,6 @@ #include <boost/shared_ptr.hpp> #include <xmloff/xmltkmap.hxx> - -// xmloff/functional.hxx is obsolete and should be replaced by its comphelper -// counterpart #include <comphelper/stl_types.hxx> #include <xmloff/uniref.hxx> diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index 7ccca93..ad17f49 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -30,15 +30,14 @@ #define _XMLOFF_METATCONTEXT_HXX #include <rtl/ref.hxx> -#include "xmloff/functional.hxx" - +#include <comphelper/stl_types.hxx> #include <map> #include "FlatTContext.hxx" typedef ::std::multimap< ::rtl::OUString, ::rtl::Reference< XMLPersTextContentTContext >, - less_functor > XMLMetaContexts_Impl; + ::comphelper::UStringLess > XMLMetaContexts_Impl; class XMLMetaTransformerContext : public XMLTransformerContext commit a8a38888b5659d4ae655d2aa26b10d248baf6732 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 20:53:17 2012 +0100 unodevtools: remove dead code diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx index 63bbd39..805b242 100644 --- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx @@ -78,15 +78,6 @@ void generateImports(std::ostream & o, ProgramOptions const & options, o << "import com.sun.star.lib.uno.helper.PropertySetMixin;\n"; } } - - -// boost::unordered_set< OString, OStringHash >::const_iterator iter = -// interfaces.begin(); -// while (iter != interfaces.end()) -// { -// o << "import " << ((*iter).getStr()) << ";\n"; -// iter++; -// } } void generateCompFunctions(std::ostream & o, const OString & classname) @@ -885,19 +876,6 @@ void generateSkeleton(ProgramOptions const & options, interfaces, services, properties); checkType(manager, "com.sun.star.frame.XDispatch", interfaces, services, properties); - - -// ProtocolCmdMap::const_iterator iter2 = options.protocolCmdMap.begin(); -// while (iter2 != options.protocolCmdMap.end()) { -// fprintf(stdout, "prt=%s\n", (*iter2).first.getStr()); - -// for (std::vector< OString >::const_iterator i = (*iter2).second.begin(); -// i != (*iter2).second.end(); ++i) { -// fprintf(stdout, "cmd=%s\n", (*i).getStr()); -// } -// iter2++; -// } -// return; } if (options.componenttype == 2) { commit 19ad1f959a9ac01e602be2e3967736cee19d0dd5 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 20:45:48 2012 +0100 np_sdk: remove unused macros diff --git a/np_sdk/inc/npapi.h b/np_sdk/inc/npapi.h index 0a2d565..de28d05 100644 --- a/np_sdk/inc/npapi.h +++ b/np_sdk/inc/npapi.h @@ -739,13 +739,6 @@ enum NPEventType { #define NPRES_USER_BREAK (NPRES_BASE + 2) /* - * Don't use these obsolete error codes any more. - */ -#define NP_NOERR NP_NOERR_is_obsolete_use_NPERR_NO_ERROR -#define NP_EINVAL NP_EINVAL_is_obsolete_use_NPERR_GENERIC_ERROR -#define NP_EABORT NP_EABORT_is_obsolete_use_NPRES_USER_BREAK - -/* * Version feature information */ #define NPVERS_HAS_STREAMOUTPUT 8 commit bb539e18daefa3cb182e34b7c3f36d486fb7f09a Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 20:41:41 2012 +0100 sal: remove dead code and empty lines diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index 8440384..c95b376 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -103,8 +103,6 @@ typedef struct _osl_TFile HANDLE m_Handle; sal_Char* m_pReadPtr; sal_Char m_ReadBuf[512]; -/* sal_Char* m_pWritePtr; */ -/* sal_Char m_WriteBuf[512]; */ sal_Char* m_pWriteBuf; sal_uInt32 m_nWriteBufLen; sal_uInt32 m_nWriteBufFree; @@ -216,7 +214,6 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag #ifdef DEBUG_OSL_PROFILE Flags=osl_Profile_FLUSHWRITE; - // OSL_TRACE("opening '%s'\n",FileName); if ( Flags == osl_Profile_DEFAULT ) { OSL_TRACE("with osl_Profile_DEFAULT"); @@ -233,10 +230,6 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag { OSL_TRACE("with osl_Profile_WRITELOCK"); } -/* if ( Flags & osl_Profile_READWRITE ) */ -/* { */ -/* OSL_TRACE("with osl_Profile_READWRITE \n"); */ -/* } */ if ( Flags & osl_Profile_FLUSHWRITE ) { OSL_TRACE("with osl_Profile_FLUSHWRITE"); @@ -260,7 +253,6 @@ oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flag pProfile->m_Flags = Flags & FLG_USER; osl_getSystemPathFromFileURL(strProfileName, &pProfile->m_strFileName); -// rtl_uString_assign(&pProfile->m_strFileName, strProfileName); if (Flags & (osl_Profile_READLOCK | osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE )) pProfile->m_pFile = pFile; @@ -305,9 +297,6 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) { if ( !( pProfile->m_Flags & osl_Profile_READLOCK ) && ( pProfile->m_Flags & FLG_MODIFIED ) ) { -/* if (pProfile->m_pFile == NULL) */ -/* pProfile->m_pFile = openFileImpl(pProfile->m_Filename, sal_True); */ - storeProfile(pProfile, sal_False); } } @@ -349,13 +338,10 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile) } if ( pProfile->m_Sections != 0 ) { - /*osl_TProfileSection* pSections=pProfile->m_Sections;*/ for ( index = 0 ; index < pProfile->m_NoSections ; ++index ) { if ( pProfile->m_Sections[index].m_Entries != 0 ) - { free(pProfile->m_Sections[index].m_Entries); - } } free(pProfile->m_Sections); } @@ -428,20 +414,13 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile) return sal_False; } -#ifdef DEBUG_OSL_PROFILE -/* OSL_TRACE("File Buffer in writeProfileImpl '%s' size == '%i' '%i'(%i)\n", - pFile->m_pWriteBuf,pFile->m_nWriteBufLen,strlen(pFile->m_pWriteBuf),pFile->m_nWriteBufLen - pFile->m_nWriteBufFree);*/ -#endif - bRet=WriteFile(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree,&BytesWritten,NULL); if ( bRet == 0 || BytesWritten <= 0 ) { OSL_ENSURE(bRet,"WriteFile failed!!!"); - OSL_TRACE("write failed '%s'",strerror(errno)); -/* OSL_TRACE("Out osl_writeProfileImpl() [write '%s']\n",strerror(errno));*/ return (sal_False); } @@ -480,7 +459,6 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, OSL_TRACE("Out osl_readProfileString [pProfile==0]"); #endif - return (sal_False); } @@ -520,7 +498,6 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, OSL_TRACE("Out osl_readProfileString [pStr==0]"); #endif - return (sal_False); } @@ -528,9 +505,6 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile, OSL_TRACE("Out osl_readProfileString [ok]"); #endif - - - return (sal_True); } @@ -1156,8 +1130,6 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile, sal_Char* pszBuff } - - /*****************************************************************************/ /* Static Module Functions */ /*****************************************************************************/ @@ -1208,64 +1180,11 @@ static sal_Bool lockFile(const osl_TFile* pFile, osl_TLockMode eMode) } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption ProfileFlags ) { osl_TFile* pFile = reinterpret_cast< osl_TFile*>( calloc( 1, sizeof(osl_TFile) ) ); sal_Bool bWriteable = sal_False; -/* if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE | osl_Profile_READWRITE ) )*/ if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) ) { #ifdef DEBUG_OSL_PROFILE @@ -1312,21 +1231,11 @@ static osl_TFile* openFileImpl(rtl_uString * strFileName, oslProfileOption Profi lockFile(pFile, bWriteable ? write_lock : read_lock); } - /* mfe: new WriteBuf obsolete */ -/* pFile->m_pWritePtr = pFile->m_Buf;*/ -/* pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf);*/ - return (pFile); } - - - - - - static osl_TStamp closeFileImpl(osl_TFile* pFile) { osl_TStamp stamp = {0, 0}; @@ -1338,17 +1247,6 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile) if (pFile->m_Handle != INVALID_HANDLE_VALUE) { - /* mfe: new WriteBuf obsolete */ - /* we just closing the file here, DO NOT write, it has to be handled in higher levels */ -/* if (pFile->m_pWritePtr > pFile->m_Buf)*/ -/* {*/ -/* DWORD Bytes;*/ - -/* WriteFile(pFile->m_Handle, pFile->m_WriteBuf,*/ -/* pFile->m_pWritePtr - pFile->m_WriteBuf,*/ -/* &Bytes, NULL);*/ -/* }*/ - stamp = getFileStamp(pFile); lockFile(pFile, un_lock); @@ -1368,29 +1266,10 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile) } - - - - - - static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate) { if (pFile->m_Handle != INVALID_HANDLE_VALUE) { - /* mfe: new WriteBuf obsolete */ - /* we just closing the file here, DO NOT write, it has to be handled in higher levels */ -/* if (pFile->m_pWritePtr > pFile->m_WriteBuf)*/ -/* {*/ -/* DWORD Bytes;*/ - -/* WriteFile(pFile->m_Handle, pFile->m_WriteBuf,*/ -/* pFile->m_pWritePtr - pFile->m_WriteBuf,*/ -/* &Bytes, NULL);*/ - -/* pFile->m_pWritePtr = pFile->m_WriteBuf;*/ -/* }*/ - pFile->m_pReadPtr = pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf); SetFilePointer(pFile->m_Handle, 0, NULL, FILE_BEGIN); @@ -1403,14 +1282,6 @@ static sal_Bool rewindFile(osl_TFile* pFile, sal_Bool bTruncate) } - - - - - - - - static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen) { DWORD Max; @@ -1491,14 +1362,6 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char *pszLine, int MaxLen) } - - - - - - - - static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine) { unsigned int Len = strlen(pszLine); @@ -1547,7 +1410,6 @@ static sal_Bool putLine(osl_TFile* pFile, const sal_Char *pszLine) /* platform specific end */ - static const sal_Char* stripBlanks(const sal_Char* String, sal_uInt32* pLen) { if ( (pLen != NULL) && ( *pLen != 0 ) ) @@ -1960,7 +1822,6 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) else { /* new section */ - if (! addSection(pProfile, i, pStr + 1, pChar - pStr - 1)) return (sal_False); } @@ -1970,9 +1831,6 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) } - - - static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) { #ifdef TRACE_OSL_PROFILE @@ -2025,9 +1883,6 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) osl_ProfileSwapProfileNames(pProfile); -/* free(pProfile->m_pFile);*/ -/* free(pTmpFile);*/ - pProfile->m_pFile = openFileImpl(pProfile->m_strFileName,pProfile->m_Flags); } @@ -2169,7 +2024,6 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable) if ( bWriteable ) { -/* PFlags = osl_Profile_DEFAULT | osl_Profile_READWRITE; */ PFlags = osl_Profile_DEFAULT | osl_Profile_WRITELOCK; } else @@ -2184,8 +2038,6 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable) OSL_TRACE("AUTOOPEN MODE"); #endif - - if ( ( pProfile = (osl_TProfileImpl*)osl_openProfile( NULL, PFlags ) ) != NULL ) { pProfile->m_Flags |= FLG_AUTOOPEN; commit e474431fd6663548c272032dcae4656abed94a89 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 20:26:38 2012 +0100 framework: remove unused timemeasure.hxx diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx index 48248dd..97b1db4 100644 --- a/framework/inc/macros/debug.hxx +++ b/framework/inc/macros/debug.hxx @@ -119,14 +119,6 @@ #include <macros/debug/mutex.hxx> //***************************************************************************************************************** -// special macros to measure times of some operations -//***************************************************************************************************************** - -/*OBSOLETE -#include <macros/debug/timemeasure.hxx> -*/ - -//***************************************************************************************************************** // special macros to debug our filter cache! //***************************************************************************************************************** #include <macros/debug/filterdbg.hxx> diff --git a/framework/inc/macros/debug/timemeasure.hxx b/framework/inc/macros/debug/timemeasure.hxx deleted file mode 100644 index c568fb8..0000000 --- a/framework/inc/macros/debug/timemeasure.hxx +++ /dev/null @@ -1,143 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_MACROS_DEBUG_TIMEMEASURE_HXX_ -#define __FRAMEWORK_MACROS_DEBUG_TIMEMEASURE_HXX_ - -//************************************************************************************************************* -// special macros for time measures -// 1) LOGFILE_TIMEMEASURE used it to define log file for this operations (default will be set automaticly) -// 2) START_TIMEMEASURE start new measure by using given variable names -// 3) START_TIMEMEASURE stop current measure by using given variable names and return time -// 4) LOG_TIMEMEASURE write measured time to logfile -//************************************************************************************************************* - -#ifdef ENABLE_TIMEMEASURE - - //_________________________________________________________________________________________________________________ - // includes - //_________________________________________________________________________________________________________________ - - #ifndef _RTL_STRBUF_HXX_ - #include <rtl/strbuf.hxx> - #endif - - #ifndef _OSL_TIME_H_ - #include <osl/time.h> - #endif - - /*_____________________________________________________________________________________________________________ - LOGFILE_TIMEMEASURE - - For follow macros we need a special log file. If user forget to specify anyone, we must do it for him! - _____________________________________________________________________________________________________________*/ - - #ifndef LOGFILE_TIMEMEASURE - #define LOGFILE_TIMEMEASURE "timemeasure.log" - #endif - - /*_____________________________________________________________________________________________________________ - class TimeMeasure - - We need this inline class as global timer to make it possible measure times over different objects! - zB. Use it as baseclass to start timer at ctor (must be first called baseclass!!!) and stop it by calling stop method. - _____________________________________________________________________________________________________________*/ - - class DBGTimeMeasureBase - { - public: - inline DBGTimeMeasureBase() - { - m_nEnd = 0 ; - m_nStart = osl_getGlobalTimer(); - } - - inline sal_Int32 stopAndGet() - { - m_nEnd = osl_getGlobalTimer(); - return( m_nEnd-m_nStart ); - } - - private: - sal_Int32 m_nStart ; - sal_Int32 m_nEnd ; - }; - - /*_____________________________________________________________________________________________________________ - START_TIMEMEASURE( NSTART, NEND ) - STOP_TIMEMEASURE( NSTART, NEND, NTIME ) - - If you doesn't need a time measure above different classes ... you can try this macros! - They initialize your given members with start end end time ... You can calculate differenz by himself. - _____________________________________________________________________________________________________________*/ - - #define START_TIMEMEASURE( NSTART, NEND ) \ - sal_Int32 NSTART = 0; \ - sal_Int32 NEND = 0; \ - NSTART = osl_getGlobalTimer(); - - #define STOP_TIMEMEASURE( NSTART, NEND, NTIME ) \ - NEND = osl_getGlobalTimer(); \ - sal_Int32 NTIME = NEND-NSTART; - - /*_____________________________________________________________________________________________________________ - LOG_TIMEMEASURE( SOPERATION, NSTART ) - - Write measured time to logfile. - _____________________________________________________________________________________________________________*/ - - #define LOG_TIMEMEASURE( SOPERATION, NTIME ) \ - { \ - ::rtl::OStringBuffer _sBuffer( 256 ); \ - _sBuffer.append( SOPERATION ); \ - _sBuffer.append( "\t=\t" ); \ - _sBuffer.append( (sal_Int32)(NTIME) ); \ - _sBuffer.append( " ms\n" ); \ - WRITE_LOGFILE( LOGFILE_TIMEMEASURE, _sBuffer.makeStringAndClear().getStr() ) \ - } - -#else // #ifdef ENABLE_TIMEMEASURE - - /*_____________________________________________________________________________________________________________ - If right testmode is'nt set - implements these macros empty! - _____________________________________________________________________________________________________________*/ - - #undef LOGFILE_TIMEMEASURE - #define START_TIMEMEASURE( NSTART, NEND ) - #define STOP_TIMEMEASURE( NSTART, NEND, NTIME ) - #define LOG_TIMEMEASURE( SOPERATION, NTIME ) - -#endif // #ifdef ENABLE_TIMEMEASURE - -//***************************************************************************************************************** -// end of file -//***************************************************************************************************************** - -#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_TIMEMEASURE_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 07cd0a886285327c9bcf87b67264ae5b40895f01 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 20:21:34 2012 +0100 WaE: unused variable rc diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index a4f094f..84910f3 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -361,14 +361,9 @@ sal_Bool ImplDrawTheme( HTHEME hTheme, HDC hDC, int iPart, int iState, RECT rc, } -Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const Rectangle& aRect, THEMESIZE eTS = TS_TRUE ) +Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const Rectangle& /* aRect */, THEMESIZE eTS = TS_TRUE ) { SIZE aSz; - RECT rc; - rc.left = aRect.nLeft; - rc.right = aRect.nRight; - rc.top = aRect.nTop; - rc.bottom = aRect.nBottom; HRESULT hr = vsAPI.GetThemePartSize( hTheme, hDC, iPart, iState, NULL, eTS, &aSz ); // TS_TRUE returns optimal size if( hr == S_OK ) return Rectangle( 0, 0, aSz.cx, aSz.cy ); commit bd8a6c93391eb8c40cd30c0c5a84abb8afef2f0a Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 20:15:10 2012 +0100 registry: remove obsolete methods diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h index 5374d65..43d058f 100644 --- a/registry/inc/registry/registry.h +++ b/registry/inc/registry/registry.h @@ -279,25 +279,6 @@ RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType, RegValue pValueList, sal_uInt32 len); -/** This function used to create a link. - - @obsolete Links are no longer supported. - - @return REG_INVALID_LINK -*/ -RegError REGISTRY_CALLTYPE reg_createLink(RegKeyHandle hKey, - rtl_uString* linkName, - rtl_uString* linkTarget); - -/** This function used to delete a link. - - @obsolete Links are no longer supported. - - @return REG_INVALID_LINK -*/ -RegError REGISTRY_CALLTYPE reg_deleteLink(RegKeyHandle hKey, - rtl_uString* linkName); - /** This function returns the type of a key. The registry differentiates two possible types: @@ -312,16 +293,6 @@ RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey, rtl_uString* keyName, RegKeyType* pKeyType); -/** This function used to return the linktarget of a link. - - @obsolete Links are no longer supported. - - @return REG_INVALID_LINK -*/ -RegError REGISTRY_CALLTYPE reg_getLinkTarget(RegKeyHandle hKey, - rtl_uString* linkName, - rtl_uString** pLinkTarget); - /** This function resolves a keyname. and returns the resolved keyName in pResolvedName. diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index b0446c7..1ae9962 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -960,31 +960,6 @@ RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType, } //********************************************************************* -// reg_createLink -// -RegError REGISTRY_CALLTYPE reg_createLink(RegKeyHandle hKey, - rtl_uString* linkName, - rtl_uString* linkTarget) -{ - if (!hKey) - return REG_INVALID_KEY; - - return createLink(hKey, linkName, linkTarget); -} - -//********************************************************************* -// reg_deleteLink -// -RegError REGISTRY_CALLTYPE reg_deleteLink(RegKeyHandle hKey, - rtl_uString* linkName) -{ - if (!hKey) - return REG_INVALID_KEY; - - return deleteLink(hKey, linkName); -} - -//********************************************************************* // reg_getKeyType // RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey, @@ -998,19 +973,6 @@ RegError REGISTRY_CALLTYPE reg_getKeyType(RegKeyHandle hKey, } //********************************************************************* -// reg_getLinkTarget -// -RegError REGISTRY_CALLTYPE reg_getLinkTarget(RegKeyHandle hKey, - rtl_uString* linkName, - rtl_uString** pLinkTarget) -{ - if (!hKey) - return REG_INVALID_KEY; - - return getLinkTarget(hKey, linkName, pLinkTarget); -} - -//********************************************************************* // reg_getResolvedKeyName // RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey, commit d10470bf1a2e170b80815d136eb5d83fc29b76ca Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 20:02:21 2012 +0100 WaE: unused variable err diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index ea32172..ec240ad 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -705,7 +705,6 @@ SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) } else { - DWORD err = GetLastError(); // #124826# avoid resource leak ! happens when runing without desktop access (remote desktop, service, may be screensavers) DeleteBitmap( hBmpBitmap ); } commit 0d5affd3001a3a2bf99e51ca9ce1f072d504e565 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 20:01:18 2012 +0100 WaE: unused variable bOk diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c index 2b9f119..29e5047 100644 --- a/sal/osl/w32/security.c +++ b/sal/osl/w32/security.c @@ -673,7 +673,7 @@ void SAL_CALL osl_unloadUserProfile(oslSecurity Security) { /* unloading the user profile */ if (fLoadUserProfile && fUnloadUserProfile) - bOk = fUnloadUserProfile(hAccessToken, ((oslSecurityImpl*)Security)->m_hProfile); + fUnloadUserProfile(hAccessToken, ((oslSecurityImpl*)Security)->m_hProfile); if (hUserEnvLib) FreeLibrary(hUserEnvLib); commit d4e6e5aab2f2157c00761944aba5e288954119b2 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 19:59:36 2012 +0100 WaE: unused variable nError diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c index 2ae8685..2b9f119 100644 --- a/sal/osl/w32/security.c +++ b/sal/osl/w32/security.c @@ -584,7 +584,6 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security) LPFNLOADUSERPROFILE fLoadUserProfile = NULL; LPFNUNLOADUSERPROFILE fUnloadUserProfile = NULL; HANDLE hAccessToken = ((oslSecurityImpl*)Security)->m_hToken; - DWORD nError = 0; /* try to create user profile */ if ( !hAccessToken ) @@ -625,8 +624,6 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security) bOk = TRUE; } - else - nError = GetLastError(); rtl_uString_release(buffer); } commit 5afdbaf3a899562b088ac45ad6dfcb5ee33919d0 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 19:57:09 2012 +0100 WaE: unused variable nPipes diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c index 6e4daa3..0532f82 100644 --- a/sal/osl/w32/pipe.c +++ b/sal/osl/w32/pipe.c @@ -74,8 +74,6 @@ struct oslPipeImpl { /* osl_create/destroy-PipeImpl */ /*****************************************************************************/ -static oslInterlockedCount nPipes = 0; - oslPipe __osl_createPipeImpl(void) { oslPipe pPipe; commit 53eda2b13861975c541cef1bd385a0afdb3194a2 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 19:56:09 2012 +0100 WaE: unused variable Event diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c index 9efe5e9..6e4daa3 100644 --- a/sal/osl/w32/pipe.c +++ b/sal/osl/w32/pipe.c @@ -307,7 +307,6 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe) { oslPipe pAcceptedPipe = NULL; - HANDLE Event; OVERLAPPED os; DWORD nBytesTransfered; @@ -315,10 +314,8 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe) rtl_uString* temp = NULL; OSL_ASSERT(pPipe); + OSL_ASSERT(pPipe->m_File != INVALID_HANDLE_VALUE); - OSL_ASSERT (pPipe->m_File != INVALID_HANDLE_VALUE); - - Event = pPipe->m_AcceptEvent; rtl_zeroMemory(&os, sizeof(OVERLAPPED)); os.hEvent = pPipe->m_AcceptEvent; ResetEvent(pPipe->m_AcceptEvent); commit b94366896f7c73bcd1fb04b6ca173bdb62005274 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 19:54:21 2012 +0100 WaE: /* inside comment diff --git a/sal/osl/w32/nlsupport.c b/sal/osl/w32/nlsupport.c index ea2b33e..c974409 100644 --- a/sal/osl/w32/nlsupport.c +++ b/sal/osl/w32/nlsupport.c @@ -52,12 +52,12 @@ struct EnumLocalesParams static DWORD g_dwTLSLocaleEncId = (DWORD) -1; /*****************************************************************************/ -/* callback function test -/* -/* osl_getTextEncodingFromLocale calls EnumSystemLocalesA, so that we don't -/* need to provide a unicode wrapper for this function under Win9x -/* that means the callback function has an ansi prototype and receives -/* the locale strings as ansi strings + * callback function test + * + * osl_getTextEncodingFromLocale calls EnumSystemLocalesA, so that we don't + * need to provide a unicode wrapper for this function under Win9x + * that means the callback function has an ansi prototype and receives + * the locale strings as ansi strings /*****************************************************************************/ BOOL CALLBACK EnumLocalesProcA( LPSTR lpLocaleStringA ) @@ -124,7 +124,7 @@ BOOL CALLBACK EnumLocalesProcA( LPSTR lpLocaleStringA ) /*****************************************************************************/ -/* GetTextEncodingFromLCID + * GetTextEncodingFromLCID /*****************************************************************************/ rtl_TextEncoding GetTextEncodingFromLCID( LCID localeId ) @@ -156,7 +156,7 @@ rtl_TextEncoding GetTextEncodingFromLCID( LCID localeId ) /*****************************************************************************/ -/* osl_getTextEncodingFromLocale + * osl_getTextEncodingFromLocale /*****************************************************************************/ rtl_TextEncoding SAL_CALL osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) @@ -203,7 +203,7 @@ rtl_TextEncoding SAL_CALL osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) } /*****************************************************************************/ -/* imp_getProcessLocale + * imp_getProcessLocale /*****************************************************************************/ void _imp_getProcessLocale( rtl_Locale ** ppLocale ) commit ad2eb0d742346b541464b4df7ac5f0a9acb28a4f Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 19:52:55 2012 +0100 WaE: unused variable nLen diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 50ad927..46f2af5 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -1747,7 +1747,6 @@ oslFileError SAL_CALL osl_getFileStatus( { if ( !pItemImpl->bFullPathNormalized ) { - sal_uInt32 nLen = rtl_uString_getLength( pItemImpl->m_pFullPath ); ::osl::LongPathBuffer< sal_Unicode > aBuffer( MAX_LONG_PATH ); sal_uInt32 nNewLen = GetCaseCorrectPathName( reinterpret_cast<LPCTSTR>( rtl_uString_getStr( pItemImpl->m_pFullPath ) ), ::osl::mingw_reinterpret_cast<LPTSTR>( aBuffer ), commit 944faca5aec0f1d0176c5cb3f686e61ef923fac6 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 19:50:51 2012 +0100 WaE: unused variable rgsabound diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index dc754be..b7de1e5 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -186,10 +186,6 @@ OLEVariant::OLEVariant(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) vt = VT_ARRAY|VT_UI1; - SAFEARRAYBOUND rgsabound[1]; - rgsabound[0].lLbound = 0; - rgsabound[0].cElements = x.getLength(); - // parray = SafeArrayCreate(VT_UI1,1,rgsabound); parray = SafeArrayCreateVector(VT_UI1, 0, x.getLength()); const sal_Int8* pBegin = x.getConstArray(); const sal_Int8* pEnd = pBegin + x.getLength(); commit 7bf5fa1dea5165c1b3e7c15e6bd6787aeb9e86be Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 19:40:50 2012 +0100 vcl: remove some more unused windows code diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index a38a6f7..bc07017 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -240,7 +240,6 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT nDispatchResult ); // \WIN\SOURCE\GDI\SALGDI3.CXX void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ); -bool ImplIsFontAvailable( HDC hDC, const UniString& rName ); // \WIN\SOURCE\APP\SALDATA.CXX rtl_TextEncoding ImplSalGetSystemEncoding(); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index e3e94b4..cbcea3d 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1465,28 +1465,6 @@ int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*, // ----------------------------------------------------------------------- -bool ImplIsFontAvailable( HDC hDC, const UniString& rName ) -{ - // Test, if Font available - LOGFONTW aLogFont; - memset( &aLogFont, 0, sizeof( aLogFont ) ); - aLogFont.lfCharSet = DEFAULT_CHARSET; - - UINT nNameLen = rName.Len(); - if ( nNameLen > (sizeof( aLogFont.lfFaceName )/sizeof( wchar_t ))-1 ) - nNameLen = (sizeof( aLogFont.lfFaceName )/sizeof( wchar_t ))-1; - memcpy( aLogFont.lfFaceName, rName.GetBuffer(), nNameLen*sizeof( wchar_t ) ); - aLogFont.lfFaceName[nNameLen] = 0; - - bool bAvailable = false; - EnumFontFamiliesExW( hDC, &aLogFont, (FONTENUMPROCW)SalEnumQueryFontProcExW, - (LPARAM)(void*)&bAvailable, 0 ); - - return bAvailable; -} - -// ----------------------------------------------------------------------- - void ImplGetLogFontFromFontSelect( HDC hDC, const FontSelectPattern* pFont, LOGFONTW& rLogFont, @@ -1787,24 +1765,6 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe // ----------------------------------------------------------------------- -int CALLBACK SalEnumCharSetsProcExA( const ENUMLOGFONTEXA* pLogFont, - const NEWTEXTMETRICEXA* /*pMetric*/, - DWORD /*nFontType*/, LPARAM lParam ) -{ - WinSalGraphics* pData = (WinSalGraphics*)lParam; - // Charset already in the list? - for ( BYTE i = 0; i < pData->mnFontCharSetCount; i++ ) - { - if ( pData->mpFontCharSets[i] == pLogFont->elfLogFont.lfCharSet ) - return 1; - } - pData->mpFontCharSets[pData->mnFontCharSetCount] = pLogFont->elfLogFont.lfCharSet; - pData->mnFontCharSetCount++; - return 1; -} - -// ----------------------------------------------------------------------- - sal_uLong WinSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ) { DBG_ASSERT( sizeof( KERNINGPAIR ) == sizeof( ImplKernPairData ), commit 949214fab82258f919b2668bd7d1b57d562feaf7 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 19:01:40 2012 +0100 unusedeasy.code: remove SvxFont::DrawText diff --git a/editeng/inc/editeng/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx index 0dc33b6..20db647 100644 --- a/editeng/inc/editeng/svxfont.hxx +++ b/editeng/inc/editeng/svxfont.hxx @@ -106,9 +106,6 @@ public: Size GetTxtSize( const OutputDevice *pOut, const String &rTxt, const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const; - void DrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt, - const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN ) const; - void QuickDrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt, const sal_uInt16 nIdx = 0, const sal_uInt16 nLen = STRING_LEN, const sal_Int32* pDXArray = NULL ) const; diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 5080038..2e76b11 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -478,37 +478,6 @@ Size SvxFont::GetTxtSize( const OutputDevice *pOut, const XubString &rTxt, } -void SvxFont::DrawText( OutputDevice *pOut, - const Point &rPos, const XubString &rTxt, - const xub_StrLen nIdx, const xub_StrLen nLen ) const -{ - if( !nLen || !rTxt.Len() ) return; - xub_StrLen nTmp = nLen; - if ( nTmp == STRING_LEN ) // already initialized? - nTmp = rTxt.Len(); - Point aPos( rPos ); - if ( nEsc ) - { - Size aSize = (this->GetSize()); - aPos.Y() -= ((nEsc*long(aSize.Height()))/ 100L); - } - Font aOldFont( ChgPhysFont( pOut ) ); - - if ( IsCapital() ) - DrawCapital( pOut, aPos, rTxt, nIdx, nTmp ); - else - { - Size aSize = GetPhysTxtSize( pOut, rTxt, nIdx, nTmp ); - - if ( !IsCaseMap() ) - pOut->DrawStretchText( aPos, aSize.Width(), rTxt, nIdx, nTmp ); - else - pOut->DrawStretchText( aPos, aSize.Width(), CalcCaseMap( rTxt ), - nIdx, nTmp ); - } - pOut->SetFont(aOldFont); -} - void SvxFont::QuickDrawText( OutputDevice *pOut, const Point &rPos, const XubString &rTxt, const xub_StrLen nIdx, const xub_StrLen nLen, const sal_Int32* pDXArray ) const diff --git a/unusedcode.easy b/unusedcode.easy index 6abc24b..fc86475 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -284,7 +284,6 @@ SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char) SvxDrawOutlinerViewForwarder::SetShapePos(Point const&) SvxDrawPage::SvxDrawPage() SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool) -SvxFont::DrawText(OutputDevice*, Point const&, String const&, unsigned short, unsigned short) const SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short) SvxGrafToolBoxControl::RegisterControl(unsigned short, SfxModule*) SvxIMapDlg::GetTargetList() const commit 39d219b6b0f5d83306cbc0a2f03560b4abc4c24f Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 18 18:54:33 2012 +0100 vcl: nFallbacklevel has no effect diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 67bb759..b806c1d 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -1319,11 +1319,8 @@ SystemGraphicsData GenPspGraphics::GetGraphicsData() const return SystemGraphicsData(); } -SystemFontData GenPspGraphics::GetSysFontData( int nFallbacklevel ) const +SystemFontData GenPspGraphics::GetSysFontData( int /* nFallbacklevel */ ) const { - if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1; - if (nFallbacklevel < 0 ) nFallbacklevel = 0; - return SystemFontData(); } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits