[Libreoffice-commits] .: 3 commits - editeng/inc editeng/source framework/inc framework/Library_fwe.mk framework/source sfx2/inc sfx2/source svx/inc svx/source xmloff/inc xmloff/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Jul 28 01:06:49 PDT 2011


 editeng/inc/editeng/editview.hxx                   |    1 
 editeng/source/editeng/editview.cxx                |    9 
 framework/Library_fwe.mk                           |    1 
 framework/inc/xml/eventsdocumenthandler.hxx        |  187 -------
 framework/source/fwe/xml/eventsdocumenthandler.cxx |  553 ---------------------
 sfx2/inc/sfx2/app.hxx                              |    1 
 sfx2/inc/sfx2/docfile.hxx                          |    1 
 sfx2/inc/sfx2/dockwin.hxx                          |    2 
 sfx2/inc/sfx2/frmdescr.hxx                         |    2 
 sfx2/inc/sfx2/sfxbasemodel.hxx                     |    2 
 sfx2/source/appl/appcfg.cxx                        |   55 --
 sfx2/source/dialog/dockwin.cxx                     |   12 
 sfx2/source/doc/docfile.cxx                        |    6 
 sfx2/source/doc/frmdescr.cxx                       |   16 
 sfx2/source/doc/sfxbasemodel.cxx                   |   14 
 svx/inc/svx/sphere3d.hxx                           |    1 
 svx/source/engine3d/sphere3d.cxx                   |    9 
 xmloff/inc/xmloff/xmluconv.hxx                     |    5 
 xmloff/source/core/xmluconv.cxx                    |   12 
 19 files changed, 889 deletions(-)

New commits:
commit e334d57bd7c43b5926889aaca58df23cf576f9e6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 28 09:02:49 2011 +0100

    callcatcher: ditch various unused methods

diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 304187d..4db4834 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -181,7 +181,6 @@ public:
     void                RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs = sal_False );
 
     sal_uLong           Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
-    sal_uLong			Write( SvStream& rOutput, EETextFormat eFormat );
 
     void 			SetBackgroundColor( const Color& rColor );
     Color			GetBackgroundColor() const;
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 89ac0e1..e005eaf 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -601,15 +601,6 @@ sal_uLong EditView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat
     return rInput.GetError();
 }
 
-sal_uLong EditView::Write( SvStream& rOutput, EETextFormat eFormat )
-{
-    DBG_CHKTHIS( EditView, 0 );
-    DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
-    PIMPEE->Write( rOutput, eFormat, pImpEditView->GetEditSelection() );
-    ShowCursor();
-    return rOutput.GetError();
-}
-
 void EditView::Cut()
 {
     DBG_CHKTHIS( EditView, 0 );
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index fefd7eb..1b86e5f 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -82,7 +82,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
     framework/source/fwe/helper/documentundoguard \
     framework/source/fwe/helper/undomanagerhelper \
     framework/source/fwe/interaction/preventduplicateinteraction \
-    framework/source/fwe/xml/eventsdocumenthandler \
     framework/source/fwe/xml/menuconfiguration \
     framework/source/fwe/xml/menudocumenthandler \
     framework/source/fwe/xml/saxnamespacefilter \
diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx
deleted file mode 100644
index fd20b2b..0000000
--- a/framework/inc/xml/eventsdocumenthandler.hxx
+++ /dev/null
@@ -1,187 +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_XML_EVENTSDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_
-
-#include <framework/eventsconfiguration.hxx>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-#include <threadhelp/threadhelpbase.hxx>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
-
-#include <boost/unordered_map.hpp>
-#include <stdtypes.h>
-
-#include <framework/fwedllapi.h>
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-namespace framework{
-
-//*****************************************************************************************************************
-// Hash code function for using in all hash maps of follow implementation.
-
-class FWE_DLLPUBLIC OReadEventsDocumentHandler :	private ThreadHelpBase,	// Struct for right initalization of lock member! Must be first of baseclasses.
-                                    public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
-{
-    public:
-        enum Events_XML_Entry
-        {
-            EV_ELEMENT_EVENTS,
-            EV_ELEMENT_EVENT,
-            EV_ATTRIBUTE_TYPE,
-            EV_ATTRIBUTE_NAME,
-            XL_ATTRIBUTE_HREF,
-            XL_ATTRIBUTE_TYPE,
-            EV_ATTRIBUTE_MACRONAME,
-            EV_ATTRIBUTE_LIBRARY,
-            EV_XML_ENTRY_COUNT
-        };
-
-        enum Event_XML_Namespace
-        {
-            EV_NS_EVENT,
-            EV_NS_XLINK,
-            EV_XML_NAMESPACES_COUNT
-        };
-
-        OReadEventsDocumentHandler( EventsConfig& aItems );
-
-
-        // XDocumentHandler
-        virtual void SAL_CALL startDocument(void)
-        throw (	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endDocument(void)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL startElement(
-            const rtl::OUString& aName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL endElement(const rtl::OUString& aName)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL characters(const rtl::OUString& aChars)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL ignorableWhitespace(const rtl::OUString& aWhitespaces)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL processingInstruction(const rtl::OUString& aTarget,
-                                                    const rtl::OUString& aData)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-        virtual void SAL_CALL setDocumentLocator(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator)
-        throw(	::com::sun::star::xml::sax::SAXException,
-                ::com::sun::star::uno::RuntimeException );
-
-    protected:
-        virtual ~OReadEventsDocumentHandler();
-
-    private:
-        ::rtl::OUString getErrorLineString();
-
-        class EventsHashMap : public ::boost::unordered_map<	::rtl::OUString					,
-                                                        Events_XML_Entry				,
-                                                        OUStringHashCode				,
-                                                        ::std::equal_to< ::rtl::OUString >	>
-        {
-            public:
-                inline void free()
-                {
-                    EventsHashMap().swap( *this );
-                }
-        };
-
-        sal_Bool																	m_bEventsStartFound;
-        sal_Bool																	m_bEventsEndFound;
-        sal_Bool																	m_bEventStartFound;
-        EventsHashMap																m_aEventsMap;
-        EventsConfig&																m_aEventItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >	m_xLocator;
-};
-
-class FWE_DLLPUBLIC OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses.
-{
-    public:
-        OWriteEventsDocumentHandler(
-            const EventsConfig& aItems,
-            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > );
-        virtual ~OWriteEventsDocumentHandler();
-
-        void WriteEventsDocument() throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-    protected:
-        virtual void WriteEvent(
-                const ::rtl::OUString& aEventName,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aPropertyValue ) throw
-            ( ::com::sun::star::xml::sax::SAXException,
-              ::com::sun::star::uno::RuntimeException );
-
-        const EventsConfig&																	m_aItems;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >	m_xWriteDocumentHandler;
-        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >		m_xEmptyList;
-        ::rtl::OUString																		m_aXMLEventNS;
-        ::rtl::OUString																		m_aXMLXlinkNS;
-        ::rtl::OUString																		m_aAttributeType;
-        ::rtl::OUString																		m_aAttributeURL;
-        ::rtl::OUString																		m_aAttributeLanguage;
-        ::rtl::OUString																		m_aAttributeLinkType;
-        ::rtl::OUString																		m_aAttributeMacroName;
-        ::rtl::OUString																		m_aAttributeLibrary;
-        ::rtl::OUString																		m_aAttributeName;
-};
-
-} // namespace framework
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/xml/eventsdocumenthandler.cxx b/framework/source/fwe/xml/eventsdocumenthandler.cxx
deleted file mode 100644
index f143ae2..0000000
--- a/framework/source/fwe/xml/eventsdocumenthandler.cxx
+++ /dev/null
@@ -1,553 +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_framework.hxx"
-
-#include <framework/fwedllapi.h>
-#include <stdio.h>
-
-//_________________________________________________________________________________________________________________
-//	my own includes
-//_________________________________________________________________________________________________________________
-
-#include <threadhelp/resetableguard.hxx>
-#include <xml/eventsdocumenthandler.hxx>
-#include <macros/debug.hxx>
-
-//_________________________________________________________________________________________________________________
-//	interface includes
-//_________________________________________________________________________________________________________________
-
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-
-//_________________________________________________________________________________________________________________
-//	other includes
-//_________________________________________________________________________________________________________________
-
-#include <sal/config.h>
-#include <vcl/svapp.hxx>
-#include <vcl/toolbox.hxx>
-
-#include <comphelper/attributelist.hxx>
-
-//_________________________________________________________________________________________________________________
-//	namespace
-//_________________________________________________________________________________________________________________
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::xml::sax;
-
-
-#define XMLNS_EVENT				"http://openoffice.org/2001/event"
-#define XMLNS_XLINK				"http://www.w3.org/1999/xlink"
-#define XMLNS_EVENT_PREFIX		"event:"
-#define XMLNS_XLINK_PREFIX		"xlink:"
-
-#define ATTRIBUTE_XMLNS_EVENT	"xmlns:event"
-#define ATTRIBUTE_XMLNS_XLINK	"xmlns:xlink"
-
-#define XMLNS_FILTER_SEPARATOR	"^"
-
-#define ELEMENT_EVENTS			"events"
-#define ELEMENT_EVENT			"event"
-
-#define ATTRIBUTE_LANGUAGE		"language"
-#define ATTRIBUTE_LIBRARY		"library"
-#define ATTRIBUTE_NAME			"name"
-#define ATTRIBUTE_HREF			"href"
-#define ATTRIBUTE_TYPE			"type"
-#define ATTRIBUTE_MACRONAME		"macro-name"
-
-#define ELEMENT_NS_EVENTS		"event:events"
-#define ELEMENT_NS_EVENT		"event:event"
-
-#define ATTRIBUTE_TYPE_CDATA	"CDATA"
-
-#define EVENTS_DOCTYPE			"<!DOCTYPE event:events PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"event.dtd\">"
-
-// Property names for events
-#define	PROP_EVENT_TYPE		"EventType"
-#define PROP_LIBRARY		"Library"
-#define PROP_SCRIPT			"Script"
-#define PROP_MACRO_NAME		"MacroName"
-#define STAR_BASIC			"StarBasic"
-#define JAVA_SCRIPT			"JavaScript"
-
-
-namespace framework
-{
-
-struct EventEntryProperty
-{
-    OReadEventsDocumentHandler::Event_XML_Namespace	nNamespace;
-    char											aEntryName[20];
-};
-
-static EventEntryProperty EventEntries[OReadEventsDocumentHandler::EV_XML_ENTRY_COUNT] =
-{
-    { OReadEventsDocumentHandler::EV_NS_EVENT,	ELEMENT_EVENTS			},
-    { OReadEventsDocumentHandler::EV_NS_EVENT,	ELEMENT_EVENT			},
-    { OReadEventsDocumentHandler::EV_NS_EVENT,	ATTRIBUTE_LANGUAGE		},
-    { OReadEventsDocumentHandler::EV_NS_EVENT,	ATTRIBUTE_NAME			},
-    { OReadEventsDocumentHandler::EV_NS_XLINK,	ATTRIBUTE_HREF			},
-    { OReadEventsDocumentHandler::EV_NS_XLINK,	ATTRIBUTE_TYPE			},
-    { OReadEventsDocumentHandler::EV_NS_EVENT,	ATTRIBUTE_MACRONAME		},
-    { OReadEventsDocumentHandler::EV_NS_EVENT,	ATTRIBUTE_LIBRARY		}
-};
-
-
-OReadEventsDocumentHandler::OReadEventsDocumentHandler( EventsConfig& aItems ) :
-    ThreadHelpBase( &Application::GetSolarMutex() ),
-    m_aEventItems( aItems )
-{
-    ::rtl::OUString aNamespaceEvent( RTL_CONSTASCII_USTRINGPARAM( XMLNS_EVENT ));
-    ::rtl::OUString aNamespaceXLink( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK ));
-    ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( XMLNS_FILTER_SEPARATOR ));
-
-    // create hash map
-    for ( int i = 0; i < (int)EV_XML_ENTRY_COUNT; i++ )
-    {
-        if ( EventEntries[i].nNamespace == EV_NS_EVENT )
-        {
-            ::rtl::OUString temp( aNamespaceEvent );
-            temp += aSeparator;
-            temp += ::rtl::OUString::createFromAscii( EventEntries[i].aEntryName );
-            m_aEventsMap.insert( EventsHashMap::value_type( temp, (Events_XML_Entry)i ) );
-        }
-        else
-        {
-            ::rtl::OUString temp( aNamespaceXLink );
-            temp += aSeparator;
-            temp += ::rtl::OUString::createFromAscii( EventEntries[i].aEntryName );
-            m_aEventsMap.insert( EventsHashMap::value_type( temp, (Events_XML_Entry)i ) );
-        }
-    }
-
-    m_bEventsStartFound				= sal_False;
-    m_bEventsEndFound				= sal_False;
-    m_bEventStartFound				= sal_False;
-}
-
-OReadEventsDocumentHandler::~OReadEventsDocumentHandler()
-{
-}
-
-// XDocumentHandler
-void SAL_CALL OReadEventsDocumentHandler::startDocument(void)
-throw (	SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL OReadEventsDocumentHandler::endDocument(void)
-throw(	SAXException, RuntimeException )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    if (( m_bEventsStartFound && !m_bEventsEndFound ) ||
-        ( !m_bEventsStartFound && m_bEventsEndFound )		)
-    {
-        ::rtl::OUString aErrorMessage = getErrorLineString();
-        aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'event:events' found!" ));
-        throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-    }
-}
-
-void SAL_CALL OReadEventsDocumentHandler::startElement(
-    const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw(	SAXException, RuntimeException )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    EventsHashMap::const_iterator pEventEntry = m_aEventsMap.find( aName );
-    if ( pEventEntry != m_aEventsMap.end() )
-    {
-        switch ( pEventEntry->second )
-        {
-            case EV_ELEMENT_EVENTS:
-            {
-                if ( m_bEventsStartFound )
-                {
-                    ::rtl::OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'event:events' cannot be embeded into 'event:events'!" ));
-                    throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-                }
-
-                m_bEventsStartFound = sal_True;
-            }
-            break;
-
-            case EV_ELEMENT_EVENT:
-            {
-                if ( !m_bEventsStartFound )
-                {
-                    ::rtl::OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'event:event' must be embeded into element 'event:events'!" ));
-                    throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-                }
-
-                if ( m_bEventStartFound )
-                {
-                    ::rtl::OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element event:event is not a container!" ));
-                    throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-                }
-
-                ::rtl::OUString aLanguage;
-                ::rtl::OUString aURL;
-                ::rtl::OUString aMacroName;
-                ::rtl::OUString aLibrary;
-                ::rtl::OUString aEventName;
-
-                m_bEventStartFound = sal_True;
-
-                long					  nIndex = m_aEventItems.aEventNames.getLength();
-                long					  nPropCount = 2; // every event config entry needs at least 2 properties
-                Sequence< PropertyValue > aEventProperties( nPropCount );
-
-                m_aEventItems.aEventNames.realloc(  nIndex + 1 );
-
-                for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ )
-                {
-                    pEventEntry = m_aEventsMap.find( xAttribs->getNameByIndex( n ) );
-                    if ( pEventEntry != m_aEventsMap.end() )
-                    {
-                        switch ( pEventEntry->second )
-                        {
-                            case EV_ATTRIBUTE_TYPE:
-                            {
-                                aLanguage = xAttribs->getValueByIndex( n );
-                            }
-                            break;
-
-                            case EV_ATTRIBUTE_NAME:
-                            {
-                                aEventName = xAttribs->getValueByIndex( n );
-                            }
-                            break;
-
-                            case XL_ATTRIBUTE_HREF:
-                            {
-                                aURL = xAttribs->getValueByIndex( n );
-                            }
-                            break;
-
-                            case EV_ATTRIBUTE_MACRONAME:
-                            {
-                                aMacroName = xAttribs->getValueByIndex( n );
-                            }
-                            break;
-
-                            case EV_ATTRIBUTE_LIBRARY:
-                            {
-                                aLibrary = xAttribs->getValueByIndex( n );
-                            }
-                            break;
-
-                                          default:
-                                              break; // nothing to do
-                        }
-                    }
-                } // for
-
-                ::rtl::OUString aRequiredAttributeName;
-                if ( aLanguage.getLength() == 0 )
-                    aRequiredAttributeName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE ));
-                else if ( aEventName.getLength() == 0 )
-                    aRequiredAttributeName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NAME ));
-
-                // check for missing attribute values
-                if ( aRequiredAttributeName.getLength() > 0 )
-                {
-                    ::rtl::OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute "));
-                    aErrorMessage += aRequiredAttributeName;
-                    aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " must have a value!" ));
-                    throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-                }
-
-                Any a;
-
-                // set properties
-                a <<= aLanguage;
-                aEventProperties[0].Value <<= a;
-                aEventProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
-
-                a <<= aMacroName;
-                aEventProperties[1].Value <<= a;
-                aEventProperties[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
-
-                if ( aLibrary.getLength() > 0 )
-                {
-                    ++nPropCount;
-                    aEventProperties.realloc( nPropCount );
-                    a <<= aLibrary;
-                    aEventProperties[nPropCount-1].Value <<= a;
-                    aEventProperties[nPropCount-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
-                }
-
-                if ( aURL.getLength() > 0 )
-                {
-                    ++nPropCount;
-                    aEventProperties.realloc( nPropCount );
-                    a <<= aURL;
-                    aEventProperties[nPropCount-1].Value <<= a;
-                    aEventProperties[nPropCount-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
-                }
-
-                // set event name
-                m_aEventItems.aEventNames[ nIndex ] = aEventName;
-
-                m_aEventItems.aEventsProperties.realloc( nIndex + 1 );
-                a <<= aEventProperties;
-                m_aEventItems.aEventsProperties[ nIndex ] = a;
-            }
-            break;
-
-                  default:
-                      break;
-        }
-    }
-}
-
-void SAL_CALL OReadEventsDocumentHandler::endElement(const ::rtl::OUString& aName)
-throw(	SAXException, RuntimeException )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    EventsHashMap::const_iterator pEventEntry = m_aEventsMap.find( aName );
-    if ( pEventEntry != m_aEventsMap.end() )
-    {
-        switch ( pEventEntry->second )
-        {
-            case EV_ELEMENT_EVENTS:
-            {
-                if ( !m_bEventsStartFound )
-                {
-                    ::rtl::OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'event:events' found, but no start element" ));
-                    throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-                }
-
-                m_bEventsStartFound = sal_False;
-            }
-            break;
-
-            case EV_ELEMENT_EVENT:
-            {
-                if ( !m_bEventStartFound )
-                {
-                    ::rtl::OUString aErrorMessage = getErrorLineString();
-                    aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "End element 'event:event' found, but no start element" ));
-                    throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
-                }
-
-                m_bEventStartFound = sal_False;
-            }
-            break;
-
-                  default:
-                      break; // impossible case
-        }
-    }
-}
-
-void SAL_CALL OReadEventsDocumentHandler::characters(const ::rtl::OUString&)
-throw(	SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL OReadEventsDocumentHandler::ignorableWhitespace(const ::rtl::OUString&)
-throw(	SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL OReadEventsDocumentHandler::processingInstruction(
-    const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ )
-throw(	SAXException, RuntimeException )
-{
-}
-
-void SAL_CALL OReadEventsDocumentHandler::setDocumentLocator(
-    const Reference< XLocator > &xLocator)
-throw(	SAXException, RuntimeException )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    m_xLocator = xLocator;
-}
-
-::rtl::OUString OReadEventsDocumentHandler::getErrorLineString()
-{
-    ResetableGuard aGuard( m_aLock );
-
-    char buffer[32];
-
-    if ( m_xLocator.is() )
-    {
-        snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>(m_xLocator->getLineNumber() ));
-        return ::rtl::OUString::createFromAscii( buffer );
-    }
-    else
-        return ::rtl::OUString();
-}
-
-
-//_________________________________________________________________________________________________________________
-//	OWriteEventsDocumentHandler
-//_________________________________________________________________________________________________________________
-
-OWriteEventsDocumentHandler::OWriteEventsDocumentHandler(
-    const EventsConfig& aItems,
-    Reference< XDocumentHandler > rWriteDocumentHandler ) :
-    ThreadHelpBase( &Application::GetSolarMutex() ),
-    m_aItems( aItems ),
-    m_xWriteDocumentHandler( rWriteDocumentHandler )
-{
-    ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
-    m_xEmptyList		= Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY );
-    m_aAttributeType	= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA ));
-    m_aXMLXlinkNS		= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX ));
-    m_aXMLEventNS		= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_EVENT_PREFIX ));
-}
-
-OWriteEventsDocumentHandler::~OWriteEventsDocumentHandler()
-{
-}
-
-void OWriteEventsDocumentHandler::WriteEventsDocument() throw
-( SAXException, RuntimeException )
-{
-    ResetableGuard aGuard( m_aLock );
-
-    m_xWriteDocumentHandler->startDocument();
-
-    // write DOCTYPE line!
-    Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY );
-    if ( xExtendedDocHandler.is() )
-    {
-        xExtendedDocHandler->unknown( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( EVENTS_DOCTYPE )) );
-        m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-    }
-
-    ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
-    Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
-
-    pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_EVENT )),
-                         m_aAttributeType,
-                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_EVENT )) );
-    pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_XLINK )),
-                         m_aAttributeType,
-                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )) );
-
-    m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EVENTS )), pList );
-    m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-
-    Sequence< PropertyValue > aEventProperties;
-
-    for ( int i = 0; i < m_aItems.aEventNames.getLength(); i++ )
-    {
-        if ( m_aItems.aEventsProperties[i] >>= aEventProperties )
-            WriteEvent( m_aItems.aEventNames[i], aEventProperties );
-    }
-
-    m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-    m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EVENTS )) );
-
-    m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-    m_xWriteDocumentHandler->endDocument();
-}
-
-//_________________________________________________________________________________________________________________
-//	protected member functions
-//_________________________________________________________________________________________________________________
-
-void OWriteEventsDocumentHandler::WriteEvent( const ::rtl::OUString& aEventName, const Sequence< PropertyValue >& aPropertyValues ) throw
-( SAXException, RuntimeException )
-{
-    if ( aPropertyValues.getLength() > 0 )
-    {
-        ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
-        Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
-
-        if ( m_aAttributeURL.getLength() == 0 )
-        {
-            m_aAttributeURL = m_aXMLXlinkNS;
-            m_aAttributeURL += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF ));
-            m_aAttributeLinkType = m_aXMLXlinkNS;
-            m_aAttributeLinkType += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE ));
-            m_aAttributeLanguage = m_aXMLEventNS;
-            m_aAttributeLanguage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_LANGUAGE ));
-            m_aAttributeMacroName = m_aXMLEventNS;
-            m_aAttributeMacroName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MACRONAME ));
-            m_aAttributeLibrary = m_aXMLEventNS;
-            m_aAttributeLibrary += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_LIBRARY ));
-            m_aAttributeName = m_aXMLEventNS;
-            m_aAttributeName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NAME ));
-        }
-
-        pList->AddAttribute( m_aAttributeName, m_aAttributeType, aEventName );
-
-        sal_Bool	bURLSet = sal_False;
-        ::rtl::OUString	aValue;
-        ::rtl::OUString	aName;
-
-        // save attributes
-        for ( int i = 0; i < aPropertyValues.getLength(); i++ )
-        {
-            aPropertyValues[i].Value >>= aValue;
-            if ( aPropertyValues[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( PROP_EVENT_TYPE )))
-                pList->AddAttribute( m_aAttributeLanguage, m_aAttributeType, aValue );
-            else if ( aPropertyValues[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( PROP_MACRO_NAME )) &&
-                      aValue.getLength() > 0 )
-                pList->AddAttribute( m_aAttributeMacroName, m_aAttributeType, aValue );
-            else if ( aPropertyValues[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( PROP_LIBRARY )) &&
-                      aValue.getLength() > 0 )
-                pList->AddAttribute( m_aAttributeLibrary, m_aAttributeType, aValue );
-            else if ( aPropertyValues[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( PROP_SCRIPT )))
-            {
-                pList->AddAttribute( m_aAttributeURL, m_aAttributeType, aValue );
-                bURLSet = sal_True;
-            }
-        }
-
-        if ( bURLSet )
-            pList->AddAttribute( m_aAttributeLinkType, m_aAttributeType, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "simple" )) );
-
-        m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EVENT )), xList );
-        m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-
-        m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EVENT )) );
-        m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-    }
-}
-
-} // namespace framework
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx
index 7c98adc..5399761 100644
--- a/svx/inc/svx/sphere3d.hxx
+++ b/svx/inc/svx/sphere3d.hxx
@@ -53,7 +53,6 @@ protected:
 public:
     TYPEINFO();
     E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize);
-    E3dSphereObj();
 
     // FG: Dieser Konstruktor wird nur von MakeObject aus der 3d-Objectfactory beim
     //     Laden von Dokumenten mit Kugeln aufgerufen. Dieser Konstruktor ruft kein
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 588dfd1..51c28be 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -76,15 +76,6 @@ E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoi
     aSize = r3DSize;
 }
 
-E3dSphereObj::E3dSphereObj()
-:	E3dCompoundObject()
-{
-    // Set defaults
-    E3dDefaultAttributes aDefault;
-    SetDefaultAttributes(aDefault);
-}
-
-
 // Create Sphere without creating the Polygons within
 
 // This call is from the 3D Object Factory (objfac3d.cxx) and only when loading
commit 0c91e303e0ef7ca551c51eedae6588c1601845ab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 27 22:09:03 2011 +0100

    callcatcher: remove various unused methods

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 625fe0e..47b6175 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -143,7 +143,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
     SfxAppData_Impl*            pAppData_Impl;
 
     DECL_DLLPRIVATE_LINK(       GlobalBasicErrorHdl_Impl, StarBASIC* );
-    SAL_DLLPRIVATE sal_Bool     SaveAll_Impl(sal_Bool bPrompt = sal_False, sal_Bool bAutoSave = sal_False);
     SAL_DLLPRIVATE short        QuerySave_Impl(SfxObjectShell &, sal_Bool bAutoSave = sal_False);
 
     static SfxApplication*      Create();
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 6c427e9..3a450dc 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -176,7 +176,6 @@ public:
     void                SetDoneLink( const Link& rLink );
     Link                GetDoneLink( ) const;
     void                SetDataAvailableLink( const Link& rLink );
-    Link                GetDataAvailableLink( ) const;
 
     sal_uInt32          GetErrorCode() const;
     sal_uInt32          GetError() const
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index 0545322..c49490d 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.hxx
@@ -118,10 +118,8 @@ public:
     SAL_DLLPRIVATE void Disappear_Impl();
     SAL_DLLPRIVATE void Reappear_Impl();
     SAL_DLLPRIVATE sal_Bool IsAutoHide_Impl() const;
-    SAL_DLLPRIVATE sal_Bool IsPinned_Impl() const;
     SAL_DLLPRIVATE void AutoShow_Impl( sal_Bool bShow = sal_True );
     SAL_DLLPRIVATE void Pin_Impl( sal_Bool bPinned );
-    SAL_DLLPRIVATE SfxSplitWindow* GetSplitWindow_Impl() const;
     SAL_DLLPRIVATE void ReleaseChildWindow_Impl();
 };
 
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index 369226c..04772b8 100644
--- a/sfx2/inc/sfx2/frmdescr.hxx
+++ b/sfx2/inc/sfx2/frmdescr.hxx
@@ -117,8 +117,6 @@ public:
     void					SetActualURL( const INetURLObject& rURL );
     void					SetActualURL( const String& rURL );
     sal_Bool					CheckContent() const;
-    sal_Bool                    CompareOriginal( SfxFrameDescriptor& rSet ) const;
-    void					UnifyContent( sal_Bool );
     void                    SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;}
     sal_Bool                    IsReadOnly(  ) const { return bReadOnly;}
     void                    SetEditable( sal_Bool bSet );
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 83d1e52..c585f48 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -1472,7 +1472,6 @@ public:
     */
 
     void changing() ;
-    SAL_DLLPRIVATE void impl_change() ;
 
     /**___________________________________________________________________________________________________
         @short		-
@@ -1488,7 +1487,6 @@ public:
     */
 
     SfxObjectShell* GetObjectShell() const ;
-    SAL_DLLPRIVATE SfxObjectShell* impl_getObjectShell() const ;
 
     SAL_DLLPRIVATE sal_Bool impl_isDisposed() const ;
     sal_Bool IsInitialized() const;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 80c69be..8fba7e0 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -900,61 +900,6 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
 }
 
 //--------------------------------------------------------------------
-
-// Save all Documents
-
-sal_Bool SfxApplication::SaveAll_Impl(sal_Bool bPrompt, sal_Bool bAutoSave)
-{
-    bAutoSave = sal_False; // functionality moved to new AutoRecovery Service!
-
-    sal_Bool bFunc = sal_True;
-    short nRet;
-
-    for ( SfxObjectShell *pDoc = SfxObjectShell::GetFirst();
-          pDoc;
-          pDoc = SfxObjectShell::GetNext(*pDoc) )
-    {
-        if( SFX_CREATE_MODE_STANDARD == pDoc->GetCreateMode() &&
-            SfxViewFrame::GetFirst(pDoc) &&
-            !pDoc->IsInModalMode() &&
-            !pDoc->HasModalViews() )
-        {
-            if ( pDoc->GetProgress() == 0 )
-            {
-                if ( !pDoc->IsModified() )
-                    continue;
-
-                if ( bPrompt || (bAutoSave && !pDoc->HasName()) )
-                    nRet = QuerySave_Impl( *pDoc, bAutoSave );
-                else
-                    nRet = RET_YES;
-
-                if ( nRet == RET_YES )
-                {
-                    SfxRequest aReq( SID_SAVEDOC, 0, pDoc->GetPool() );
-                    const SfxPoolItem *pPoolItem = pDoc->ExecuteSlot( aReq );
-                    if ( !pPoolItem || !pPoolItem->ISA(SfxBoolItem) ||
-                        !( (const SfxBoolItem*) pPoolItem )->GetValue() )
-                        bFunc = sal_False;
-                }
-                else if ( nRet == RET_CANCEL )
-                {
-                    bFunc = sal_False;
-                    break;
-                }
-                else if ( nRet == RET_NO )
-                {
-                }
-            }
-        }
-    }
-
-    return bFunc;
-}
-
-//--------------------------------------------------------------------
-
-//--------------------------------------------------------------------
 void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
 {
     SfxObjectShell *pDoc = rEventHint.GetObjShell();
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index e2e423e..6ff80f3 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1907,13 +1907,6 @@ sal_Bool SfxDockingWindow::IsAutoHide_Impl() const
         return sal_False;
 }
 
-sal_Bool SfxDockingWindow::IsPinned_Impl() const
-{
-    if ( pImp->pSplitWin )
-        return pImp->pSplitWin->IsPinned();
-    else
-        return sal_True;
-}
 void SfxDockingWindow::AutoShow( sal_Bool bShow )
 {
     AutoShow_Impl(bShow);
@@ -1930,11 +1923,6 @@ void SfxDockingWindow::AutoShow_Impl( sal_Bool bShow )
     }
 }
 
-SfxSplitWindow* SfxDockingWindow::GetSplitWindow_Impl() const
-{
-    return pImp->pSplitWin;
-}
-
 void SfxDockingWindow::FadeIn( sal_Bool /*bFadeIn*/ )
 {
 }
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index bd1f9b1..7c0c9a5 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -775,12 +775,6 @@ sal_Bool SfxMedium::IsStorage()
 }
 
 //------------------------------------------------------------------
-Link SfxMedium::GetDataAvailableLink() const
-{
-    return pImp->aAvailableLink.GetLink();
-}
-
-//------------------------------------------------------------------
 Link SfxMedium::GetDoneLink() const
 {
     return pImp->aDoneLink.GetLink();
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 8e15329..bc259da 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -119,28 +119,12 @@ sal_Bool SfxFrameDescriptor::IsEditable() const
     return pImp->bEditable;
 }
 
-sal_Bool SfxFrameDescriptor::CompareOriginal( SfxFrameDescriptor& rDescr ) const
-{
-    if( aURL != rDescr.aURL )
-        return sal_False;
-    else
-        return sal_True;
-}
-
 sal_Bool SfxFrameDescriptor::CheckContent() const
 {
     sal_Bool bRet = !( aURL == aActualURL );
     return bRet;
 }
 
-void SfxFrameDescriptor::UnifyContent( sal_Bool bTakeActual )
-{
-    if ( bTakeActual )
-        aURL = aActualURL;
-    else
-        aActualURL = aURL;
-}
-
 SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const
 {
     SfxFrameDescriptor *pFrame = new SfxFrameDescriptor;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index ee2b23e..e2269db 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2643,15 +2643,6 @@ void SfxBaseModel::changing()
     NotifyModifyListeners_Impl();
 }
 
-void SfxBaseModel::impl_change()
-{
-    // object already disposed?
-    if ( impl_isDisposed() )
-        return;
-
-    NotifyModifyListeners_Impl();
-}
-
 //________________________________________________________________________________________________________
 //	public impl.
 //________________________________________________________________________________________________________
@@ -2661,11 +2652,6 @@ SfxObjectShell* SfxBaseModel::GetObjectShell() const
     return m_pData ? (SfxObjectShell*) m_pData->m_pObjectShell : 0;
 }
 
-SfxObjectShell* SfxBaseModel::impl_getObjectShell() const
-{
-    return m_pData ? (SfxObjectShell*) m_pData->m_pObjectShell : 0;
-}
-
 //________________________________________________________________________________________________________
 //	public impl.
 //________________________________________________________________________________________________________
commit 56da19cdc1cac77693a2688bdfbc55e0dc6b47f3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 27 22:07:45 2011 +0100

    callcatcher: remove unused disaster waiting to happen

diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index 66eba41..20b818e 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -101,11 +101,6 @@ private:
     // #110680#
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxServiceFactory;
 
-    SAL_DLLPRIVATE static ::rtl::OUString msXML_false;
-    SAL_DLLPRIVATE static ::rtl::OUString msXML_true;
-
-    SAL_DLLPRIVATE static void initXMLStrings();
-
     SAL_DLLPRIVATE void createNumTypeInfo() const;
 
 public:
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index b40258a..79b7197 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -71,18 +71,6 @@ const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11;
 const sal_Int8 XML_MAXDIGITSCOUNT_DATETIME = 6;
 #define XML_NULLDATE "NullDate"
 
-OUString SvXMLUnitConverter::msXML_true;
-OUString SvXMLUnitConverter::msXML_false;
-
-void SvXMLUnitConverter::initXMLStrings()
-{
-    if( msXML_true.getLength() == 0 )
-    {
-        msXML_true = GetXMLToken(XML_TRUE);
-        msXML_false = GetXMLToken(XML_FALSE);
-    }
-}
-
 void SvXMLUnitConverter::createNumTypeInfo() const
 {
     if( mxServiceFactory.is() )


More information about the Libreoffice-commits mailing list