diff options
25 files changed, 2 insertions, 339 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 6b6e6835f5de..7cbf1d07a9a4 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -93,7 +93,6 @@ #include <svx/svdoedge.hxx> #include <svx/sxekitm.hxx> #include <editeng/flditem.hxx> -#include <svtools/sychconv.hxx> #include <tools/zcodec.hxx> #include <filter/msfilter/svxmsbas.hxx> #include <sfx2/objsh.hxx> diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 406c8bb3275c..89b48fc8972b 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -57,8 +57,6 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer, const Menu* GetMenu(); - ::com::sun::star::uno::Sequence< sal_Int8 > GetUnoTunnelId() const; - // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx index 0ec30f5432b0..0cef42caba0e 100644 --- a/framework/inc/framework/addonmenu.hxx +++ b/framework/inc/framework/addonmenu.hxx @@ -93,7 +93,6 @@ class FWE_DLLPUBLIC AddonMenuManager }; static sal_Bool HasAddonMenuElements(); - static sal_Bool HasAddonHelpMenuElements(); static sal_Bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } diff --git a/framework/inc/framework/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx index b095f787f71a..08c55185db0a 100644 --- a/framework/inc/framework/addonsoptions.hxx +++ b/framework/inc/framework/addonsoptions.hxx @@ -193,16 +193,6 @@ class FWE_DLLPUBLIC AddonsOptions sal_Bool HasAddonsMenu() const; /*-****************************************************************************************************//** - @short returns if an addons help menu is available - @descr Call to retrieve if a addons menu is available - - - @return sal_True if there is a menu otherwise sal_False - *//*-*****************************************************************************************************/ - - sal_Bool HasAddonsHelpMenu() const; - - /*-****************************************************************************************************//** @short returns number of addons toolbars @descr Call to retrieve the number of addons toolbars diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx index 1671a594ec06..bf052bc67e59 100644 --- a/framework/inc/framework/menuconfiguration.hxx +++ b/framework/inc/framework/menuconfiguration.hxx @@ -114,9 +114,6 @@ class FWE_DLLPUBLIC MenuConfiguration ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream ) throw ( ::com::sun::star::lang::WrappedTargetException ); - static sal_Bool IsPickListItemId( sal_uInt16 nId ); - static sal_Bool IsWindowListItemId( sal_uInt16 nId ); - private: // do not hold the uno reference by reference const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_rxServiceManager; diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index bae9efb23419..2a9196ae1b1f 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -133,11 +133,6 @@ sal_Bool AddonMenuManager::HasAddonMenuElements() return AddonsOptions().HasAddonsMenu(); } -sal_Bool AddonMenuManager::HasAddonHelpMenuElements() -{ - return AddonsOptions().HasAddonsHelpMenu(); -} - // Factory method to create different Add-On menu types PopupMenu* AddonMenuManager::CreatePopupMenuType( MenuType eMenuType, const Reference< XFrame >& rFrame ) { diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 4e1b58316880..714f8fd13492 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -262,7 +262,6 @@ class AddonsOptions_Impl : public ConfigItem *//*-*****************************************************************************************************/ sal_Bool HasAddonsMenu () const ; - sal_Bool HasAddonsHelpMenu () const ; sal_Int32 GetAddonsToolBarCount() const ; const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const ; const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const ; @@ -515,14 +514,6 @@ sal_Bool AddonsOptions_Impl::HasAddonsMenu() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool AddonsOptions_Impl::HasAddonsHelpMenu () const -{ - return ( m_aCachedHelpMenuProperties.getLength() > 0 ); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const { return m_aCachedToolBarPartProperties.size(); @@ -1665,16 +1656,6 @@ sal_Bool AddonsOptions::HasAddonsMenu() const // public method //***************************************************************************************************************** -sal_Bool AddonsOptions::HasAddonsHelpMenu() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->HasAddonsHelpMenu(); -} - -//***************************************************************************************************************** -// public method -//***************************************************************************************************************** - sal_Int32 AddonsOptions::GetAddonsToolBarCount() const { MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index 45598b6b47c1..9f6fe91a685b 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -72,11 +72,6 @@ RootActionTriggerContainer::~RootActionTriggerContainer() { } -Sequence< sal_Int8 > RootActionTriggerContainer::GetUnoTunnelId() const -{ - return impl_getStaticIdentifier(); -} - const Menu* RootActionTriggerContainer::GetMenu() { if ( !m_bContainerChanged ) diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index c0feda7ec766..d823edc7dc82 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -63,17 +63,6 @@ using namespace ::com::sun::star::io; namespace framework { -sal_Bool MenuConfiguration::IsPickListItemId( sal_uInt16 nId ) -{ - return (( START_ITEMID_PICKLIST <= nId ) && ( nId <= END_ITEMID_PICKLIST )); -} - -sal_Bool MenuConfiguration::IsWindowListItemId( sal_uInt16 nId ) -{ - return (( START_ITEMID_WINDOWLIST <= nId ) && ( nId <= END_ITEMID_WINDOWLIST )); -} - - MenuConfiguration::MenuConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ) : m_rxServiceManager( rServiceManager ) diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index e5f6fdceeed3..024bef81bfb9 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -153,28 +153,6 @@ void UnoDialog::setVisible( const OUString& rName, sal_Bool bVisible ) // ----------------------------------------------------------------------------- -sal_Bool UnoDialog::isHighContrast() -{ - sal_Bool bHighContrast = sal_False; - try - { - sal_Int32 nBackgroundColor = 0; - if ( mxDialogModelPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) ) ) >>= nBackgroundColor ) - { - sal_uInt8 nLum( static_cast< sal_uInt8 >( ( static_cast< sal_uInt8 >( nBackgroundColor >> 16 ) * 28 + - static_cast< sal_uInt8 >( nBackgroundColor >> 8 ) * 151 + - static_cast< sal_uInt8 >( nBackgroundColor ) * 77 ) >> 8 ) ); - bHighContrast = nLum <= 38; - } - } - catch( Exception& ) - { - } - return bHighContrast; -} - -// ----------------------------------------------------------------------------- - Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference< XActionListener > xActionListener, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index 78e3fd0f409c..b89164d93543 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -84,8 +84,6 @@ public : void setVisible( const rtl::OUString& rName, sal_Bool bVisible ); - sal_Bool isHighContrast(); - sal_Int32 getMapsFromPixels( sal_Int32 nPixels ) const; com::sun::star::uno::Reference< com::sun::star::awt::XButton > insertButton( const rtl::OUString& rName, diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 8d012052d7b9..7caf93cabe03 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -157,7 +157,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/edit/editsyntaxhighlighter \ svtools/source/edit/svmedit \ svtools/source/edit/svmedit2 \ - svtools/source/edit/sychconv \ svtools/source/edit/syntaxhighlight \ svtools/source/edit/textdata \ svtools/source/edit/textdoc \ diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk index 0a94ec8c8947..e1eb805b51ab 100644 --- a/svtools/Package_inc.mk +++ b/svtools/Package_inc.mk @@ -144,7 +144,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/sv $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrolinterface.hxx,svtools/table/tablecontrolinterface.hxx)) diff --git a/svtools/inc/svtools/sychconv.hxx b/svtools/inc/svtools/sychconv.hxx deleted file mode 100644 index 73936870157a..000000000000 --- a/svtools/inc/svtools/sychconv.hxx +++ /dev/null @@ -1,50 +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 _SYCHCONV_HXX -#define _SYCHCONV_HXX - -#include <tools/string.hxx> -#include <vcl/font.hxx> - -// ---------------------- -// - CharacterConverter - -// ---------------------- - -class OutputDevice; - -class SymCharConverter -{ -public: - - static sal_Bool Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL ); -}; - -#endif // _CHARCONV_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx deleted file mode 100644 index c20ebd962acd..000000000000 --- a/svtools/source/edit/sychconv.cxx +++ /dev/null @@ -1,106 +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. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" -#include <svtools/sychconv.hxx> -#include <vcl/outdev.hxx> - -sal_Bool SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev ) -{ - // hibyte 0 = exact matching - // 1 = little differences, - // 2 = the converted character does not look like the original but got the same meaning - // 3 = the destination does not match looking and meaning of the original - - static sal_uInt16 const aWingdingsToStarBatsTable[ 256 - 32 ] = - { - 0x0020, 0x0238, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0174, 0x02BA, 0x017B, 0x017C, 0x037C, 0x037C, 0x037C, 0x037C, - 0x0000, 0x0000, 0x0372, 0x0272, 0x0372, 0x0000, 0x0000, 0x0374, 0x0279, 0x0000, 0x027A, 0x0000, 0x0178, 0x0278, 0x0000, 0x0137, - 0x027E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x017D, 0x0000, 0x0000, 0x0000, 0x0021, 0x03AC, 0x00AD, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x01C0, 0x0000, 0x0000, 0x0286, 0x0286, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, 0x0023, 0x0024, 0x0025, - 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x0133, 0x0000, 0x0000, 0x0000, 0x0000, 0x0193, 0x0194, 0x0000, - 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, 0x0071, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, - 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01A5, 0x0095, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002E, 0x0024, 0x0125, 0x0000, 0x0000, 0x0000, 0x014B, 0x024D, 0x014E, 0x014A, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002F, 0x0000, 0x0000, 0x0000, 0x0035, 0x0000, 0x0000, 0x0000, - 0x0030, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01B1, - 0x01AF, 0x01B2, 0x01B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0x0032, 0x0033, 0x0034, 0x01C8 - }; - - static sal_uInt16 const aMonotypeSortsToStarBatsTable[ 256 - 32 ]= - { - 0x0020, 0x00cb, 0x00cb, 0x00cb, 0x00cb, 0x0074, 0x00ba, 0x0021, 0x00cc, 0x007b, 0x0036, 0x007d, 0x007e, 0x0037, 0x0038, 0x0038, - 0x0039, 0x0038, 0x0038, 0x0039, 0x003a, 0x004f, 0x0050, 0x004f, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0086, 0x0086, 0x0086, - 0x0052, 0x00cd, 0x0044, 0x0045, 0x0046, 0x0047, 0x0041, 0x0041, 0x0058, 0x0057, 0x0075, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, - 0x005a, 0x004b, 0x004b, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004e, 0x004b, 0x004b, 0x00ce, 0x00ce, 0x00ce, - 0x00ce, 0x00ce, 0x00ce, 0x00ce, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00b9, 0x00b9, 0x003b, 0x003c, 0x003d, 0x003e, - 0x003f, 0x003e, 0x0040, 0x00c5, 0x00c4, 0x002b, 0x002c, 0x00d0, 0x00d1, 0x00d1, 0x00d1, 0x0091, 0x0092, 0x0093, 0x0094, 0x0000, - 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x00d4, 0x00d4, 0x00d4, 0x00d6, 0x00d6, 0x00d4, 0x00d4, 0x00d5, 0x002a, 0x00d6, 0x00d7, 0x0068, 0x0069, 0x006a, 0x006b, - 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, - 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, - 0x0063, 0x0064, 0x0065, 0x0066, 0x0030, 0x0031, 0x00d8, 0x00d9, 0x00da, 0x00bc, 0x00db, 0x00bc, 0x00bc, 0x00bc, 0x00bc, 0x0031, - 0x0031, 0x0031, 0x002f, 0x002f, 0x002f, 0x00be, 0x00be, 0x0031, 0x0031, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, - 0x0000, 0x00af, 0x0035, 0x00dc, 0x00da, 0x00dc, 0x00db, 0x00da, 0x00dc, 0x00db, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00af, 0x0000 - }; - - const sal_uInt16* pTransTable = NULL; - - sal_Bool bIsAvailable = ( pDev ) ? pDev->IsFontAvailable( rFont.GetName() ) : sal_False; - if ( !bIsAvailable ) - { - if ( rFont.GetName().CompareToAscii( RTL_CONSTASCII_STRINGPARAM( "Wingdings" ) ) == COMPARE_EQUAL ) - pTransTable = &aWingdingsToStarBatsTable[ 0 ]; - else if ( rFont.GetName().CompareToAscii( RTL_CONSTASCII_STRINGPARAM( "Monotype Sorts" ) ) == COMPARE_EQUAL ) - pTransTable = &aMonotypeSortsToStarBatsTable[ 0 ]; - } - if ( pTransTable ) - { - sal_Unicode c; - for ( sal_uInt16 i = rString.Len(); i--; ) - { - c = rString.GetChar( i ); - c -= 32; - c = ( ((sal_uInt16)c) >= 224 ) ? 0 : (sal_Unicode) pTransTable[ c ]; - if ( !c ) // if character is out of range or not matching - c = 0xA5; // we will default a StarBats-Bullet - rString.SetChar( i, c ); - } - rFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); - rFont.SetName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarBats" ) ) ); - return sal_True; - } - else return sal_False; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index 3f5f2a5bdc6b..3f5e267df37f 100644 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx @@ -134,9 +134,6 @@ public: // ::com::sun::star::form::XInsertListener void inserted(const ::com::sun::star::lang::EventObject& rEvent); - // ::com::sun::star::form::XRestoreListener - void restored(const ::com::sun::star::lang::EventObject& rEvent); - void markColumn(sal_uInt16 nId); sal_Bool isColumnMarked(sal_uInt16 nId) const; diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx index 159df0563892..e9d32a206f4d 100644 --- a/svx/inc/svx/unoshtxt.hxx +++ b/svx/inc/svx/unoshtxt.hxx @@ -76,13 +76,9 @@ public: virtual SfxBroadcaster& GetBroadcaster() const; - SdrObject* GetSdrObject() const; - void lock(); void unlock(); -// static sal_Bool hasLevels( const SdrObject* pObject ); - // the SvxViewForwarder interface virtual sal_Bool IsValid() const; virtual Rectangle GetVisArea() const; diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 5393ef8fd085..b2def05db38d 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -475,29 +475,6 @@ IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) const return pIMapObj; } -SdrObject* IMapWindow::GetSdrObj( const IMapObject* pIMapObj ) const -{ - SdrObject* pSdrObj = NULL; - SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - sal_uIntPtr nCount; - - if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) ) - { - for ( sal_uIntPtr i = 0; i < nCount; i++ ) - { - SdrObject* pTestObj = pPage->GetObj( i ); - - if ( pIMapObj == GetIMapObj( pTestObj ) ) - { - pSdrObj = pTestObj; - break; - } - } - } - - return pSdrObj; -} - void IMapWindow::Command(const CommandEvent& rCEvt) { Region aRegion; diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index d5eba52dfaa4..e8c9171782f8 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -134,7 +134,6 @@ protected: SdrObject* CreateObj( const IMapObject* pIMapObj ); IMapObject* GetIMapObj( const SdrObject* pSdrObj ) const; - SdrObject* GetSdrObj( const IMapObject* pIMapObj ) const; SdrObject* GetHitSdrObj( const Point& rPosPixel ) const; void UpdateInfo( sal_Bool bNewObj ); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 2dc7a3671f8c..2837df851b7d 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1457,28 +1457,6 @@ void FmGridControl::inserted(const ::com::sun::star::lang::EventObject& /*rEvent } -// XCancelUpdateRecordListener -//------------------------------------------------------------------------------ -void FmGridControl::restored(const ::com::sun::star::lang::EventObject& rEvent) -{ - if (!GetCurrentRow().Is()) - return; - - sal_Bool bAppending = GetCurrentRow()->IsNew(); - sal_Bool bDirty = GetCurrentRow()->IsModified(); - if (bAppending && (EditBrowseBox::IsModified() || bDirty)) - { - if (Controller().Is()) - Controller()->ClearModified(); - - // jetzt die Zeile herausnehmen - RowRemoved(GetRowCount() - 1, 1, sal_True); - GetNavigationBar().InvalidateAll(); - } - - positioned(rEvent); -} - //------------------------------------------------------------------------------ BrowserHeader* FmGridControl::imp_CreateHeaderBar(BrowseBox* pParent) { diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 4b9cbb508fbe..1ba003092177 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -143,20 +143,6 @@ sal_Bool AccessibleCell::ResetState (sal_Int16 aState) return bStateHasChanged; } -// -------------------------------------------------------------------- - -sal_Bool AccessibleCell::GetState (sal_Int16 aState) -{ - if (aState == AccessibleStateType::FOCUSED && mpText != NULL) - { - // Just delegate the call to the edit engine. The state is not - // merged into the state set. - return mpText->HaveFocus(); - } - else - return AccessibleContextBase::GetState (aState); -} - //----------------------------------------------------------------------------- bool AccessibleCell::operator== (const AccessibleCell& rAccessibleCell) diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index fe2fdfaf6bc1..5b32554f39ac 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -72,7 +72,6 @@ public: virtual sal_Bool SetState (sal_Int16 aState); virtual sal_Bool ResetState (sal_Int16 aState); - sal_Bool GetState (sal_Int16 aState); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 514497ff6e47..84ffd5227e0b 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -1094,11 +1094,6 @@ SfxBroadcaster& SvxTextEditSource::GetBroadcaster() const return *mpImpl; } -SdrObject* SvxTextEditSource::GetSdrObject() const -{ - return mpImpl->GetSdrObject(); -} - void SvxTextEditSource::lock() { mpImpl->lock(); diff --git a/unusedcode.easy b/unusedcode.easy index b2d7c3727fb2..118e7a200b31 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -171,7 +171,6 @@ FmEntryDataArray::Remove(FmEntryData* const&, unsigned short) FmFieldWinMgr::GetChildWindowId() FmFormModel::FmFormModel(SfxItemPool*, SfxObjectShell*, bool) FmFormObj::getType() const -FmGridControl::restored(com::sun::star::lang::EventObject const&) FmPropBrwMgr::GetChildWindowId() FmXFilterCell::getImplementation(com::sun::star::uno::Reference<com::sun::star::awt::XControl> const&) FmXFormShell::clearFilter() @@ -221,7 +220,6 @@ HeaderBar::SetHelpId(unsigned short, rtl::OString const&) HeaderBar::SetHelpText(unsigned short, String const&) HelpTextWindow::RegisterAccessibleParent() HelpTextWindow::RevokeAccessibleParent() -IMapWindow::GetSdrObj(IMapObject const*) const IconChoiceDialog::RemoveResetButton() IconChoiceDialog::RemoveTabPage(unsigned short) ImageAryData::ImageAryData() @@ -550,10 +548,12 @@ ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short) ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short) ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*) ScInputBarGroup::GainFocus() +ScInputBarGroup::LinkStubImpl_ScrollHdl(void*, void*) ScJobSetup::ScJobSetup(SfxPrinter*) ScLeftFooterEditPage::GetRanges() ScLeftHeaderEditPage::GetRanges() ScMatrix::CalcOffset(unsigned long, unsigned long) const +ScMultiTextWnd::GetLineCount() ScMyCellInfo::ScMyCellInfo() ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&) ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*, short, rtl::OUString const*, ScXMLImport&) @@ -1219,7 +1219,6 @@ SvxTabStopArr::Remove(SvxTabStop const&, unsigned short) SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short) SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short) SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*) -SvxTextEditSource::GetSdrObject() const SvxUnoFontDescriptor::getPropertyState(SfxItemSet const&) SvxUnoTextBase::InsertField(SvxFieldItem const&) SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*) @@ -1402,7 +1401,6 @@ UnoControlModel::GetImplementation(com::sun::star::uno::Reference<com::sun::star UnoControlModel::UnoControlModel() UnoControlModel::getInfoHelper() UnoDialog::getMapsFromPixels(int) const -UnoDialog::isHighContrast() UnoListBoxControl::getActionListeners() UnoListBoxControl::getItemListeners() UnoMemoryStream::UnoMemoryStream(unsigned int, unsigned int) @@ -1577,7 +1575,6 @@ _ZSortFlys::Remove(_ZSortFly const&, unsigned short) _ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short) _ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short) _ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*) -accessibility::AccessibleCell::GetState(short) accessibility::AccessibleEditableTextPara::GetText(int) accessibility::AccessibleEditableTextPara::HasState(short) accessibility::AccessibleEditableTextPara::IsActive() const @@ -2359,7 +2356,6 @@ formula::FormulaTokenIterator::First() formula::ResourceManager::loadString(unsigned short, char const*, rtl::OUString const&) formula::StructPage::GetSelectedEntryText() formula::StructPage::GetSelectedToken() -framework::AddonMenuManager::HasAddonHelpMenuElements() framework::AddonsToolBarManager::LinkStubHighlight(void*, void*) framework::BmkMenu::BmkMenu(com::sun::star::uno::Reference<com::sun::star::frame::XFrame>&, framework::BmkMenu::BmkMenuType, framework::BmkMenu*) framework::ConstItemContainer::ConstItemContainer(framework::RootItemContainer const&, unsigned char) @@ -2368,14 +2364,11 @@ framework::HandlerCache::exists(rtl::OUString const&) const framework::ImagesConfiguration::LoadImages(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::ImageListsDescriptor&) framework::ImagesConfiguration::StoreImages(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, SvStream&, framework::ImageListsDescriptor const&) framework::ItemContainer::getSomething(com::sun::star::uno::Sequence<signed char> const&) -framework::MenuConfiguration::IsPickListItemId(unsigned short) -framework::MenuConfiguration::IsWindowListItemId(unsigned short) framework::MenuDispatcher::LinkStubClose_Impl(void*, void*) framework::OReadMenuBarHandler::getServiceFactory() framework::Panel::Panel(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, framework::PanelPosition) framework::PanelWindow::PanelWindow(Window*, long) framework::RootActionTriggerContainer::GetMenu() -framework::RootActionTriggerContainer::GetUnoTunnelId() const framework::RootItemContainer::RootItemContainer(framework::ConstItemContainer const&) framework::ShareableMutex::getShareableOslMutex() framework::StatusBarDescriptor::DeleteAndDestroy(unsigned short, unsigned short) @@ -2807,7 +2800,6 @@ psp::PrinterJob::GetDocumentHeader() psp::PrinterJob::GetDocumentTrailer() psp::PrinterJob::GetErrorCode() psp::appendStr(char const*, char*, int) -psp::existsTmpDir(char const*) pyuno::Runtime::finalize() pyuno::importToGlobal(_object*, _object*, _object*) rptui::OFieldExpressionControl::LinkStubAsynchActivate(void*, void*) diff --git a/vcl/unx/generic/printergfx/printerjob.cxx b/vcl/unx/generic/printergfx/printerjob.cxx index b0db3def22c5..7ae6a28372f6 100644 --- a/vcl/unx/generic/printergfx/printerjob.cxx +++ b/vcl/unx/generic/printergfx/printerjob.cxx @@ -218,23 +218,6 @@ PrinterJob::PrinterJob () : namespace psp { -/* check whether the given name points to a directory which is - usable for the user */ -sal_Bool -existsTmpDir (const char* pName) -{ - struct stat aFileStatus; - - if (pName == NULL) - return sal_False; - if (stat(pName, &aFileStatus) != 0) - return sal_False; - if (! S_ISDIR(aFileStatus.st_mode)) - return sal_False; - - return access(pName, W_OK | R_OK) == 0 ? sal_True : sal_False; -} - /* return the username in the given buffer */ sal_Bool getUserName (char* pName, int nSize) |