Kaydet (Commit) 2addd7f1 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Clean up function declarations and some unused functions

Change-Id: Id7ecd49ea03f225fc350a31437c32b4a738d7199
üst 02e0be06
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVL_SOURCE_INC_REGISTERSERVICES_HXX
#define INCLUDED_SVL_SOURCE_INC_REGISTERSERVICES_HXX
#include <sal/config.h>
#include <com/sun/star/uno/Reference.hxx>
#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; }
namespace uno { class XInterface; }
} } }
css::uno::Reference<css::uno::XInterface> SAL_CALL PathService_CreateInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const &);
css::uno::Reference<css::uno::XInterface> SAL_CALL
SvNumberFormatsSupplierServiceObject_CreateInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const &);
css::uno::Reference<css::uno::XInterface> SAL_CALL
SvNumberFormatterServiceObj_CreateInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const &);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <algorithm> #include <algorithm>
#include <string.h> #include <string.h>
#include <boost/noncopyable.hpp>
#include "rtl/instance.hxx" #include "rtl/instance.hxx"
#include "rtl/crc.h" #include "rtl/crc.h"
#include <tools/solar.h> #include <tools/solar.h>
...@@ -50,7 +51,7 @@ IMPL_PTRHINT (INetURLHistoryHint, const INetURLObject); ...@@ -50,7 +51,7 @@ IMPL_PTRHINT (INetURLHistoryHint, const INetURLObject);
* INetURLHistory_Impl interface. * INetURLHistory_Impl interface.
* *
*======================================================================*/ *======================================================================*/
class INetURLHistory_Impl class INetURLHistory_Impl: private boost::noncopyable
{ {
/** head_entry. /** head_entry.
*/ */
...@@ -93,15 +94,6 @@ class INetURLHistory_Impl ...@@ -93,15 +94,6 @@ class INetURLHistory_Impl
/** Comparison. /** Comparison.
*/ */
bool operator== (const hash_entry &rOther) const
{
return (m_nHash == rOther.m_nHash);
}
bool operator< (const hash_entry &rOther) const
{
return (m_nHash < rOther.m_nHash);
}
bool operator== (sal_uInt32 nHash) const bool operator== (sal_uInt32 nHash) const
{ {
return (m_nHash == nHash); return (m_nHash == nHash);
...@@ -189,11 +181,6 @@ class INetURLHistory_Impl ...@@ -189,11 +181,6 @@ class INetURLHistory_Impl
rThis.m_nPrev = nThis; rThis.m_nPrev = nThis;
} }
/** Not implemented.
*/
INetURLHistory_Impl (const INetURLHistory_Impl&);
INetURLHistory_Impl& operator= (const INetURLHistory_Impl&);
public: public:
INetURLHistory_Impl (void); INetURLHistory_Impl (void);
~INetURLHistory_Impl (void); ~INetURLHistory_Impl (void);
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
#include <svl/zformat.hxx> #include <svl/zformat.hxx>
#include <svl/itemprop.hxx> #include <svl/itemprop.hxx>
#include <registerservices.hxx>
using namespace com::sun::star; using namespace com::sun::star;
#define PROPERTYNAME_FMTSTR "FormatString" #define PROPERTYNAME_FMTSTR "FormatString"
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <svl/strmadpt.hxx> #include <svl/strmadpt.hxx>
#include <svl/instrm.hxx> #include <svl/instrm.hxx>
#include <registerservices.hxx>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::io; using namespace ::com::sun::star::io;
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/io/XPersistObject.hpp> #include <com/sun/star/io/XPersistObject.hpp>
#include <registerservices.hxx>
/** /**
* SvNumberFormatsSupplierServiceObject - a number formats supplier which * SvNumberFormatsSupplierServiceObject - a number formats supplier which
* - can be instantiated as an service * - can be instantiated as an service
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#include <com/sun/star/frame/XConfigManager.hpp> #include <com/sun/star/frame/XConfigManager.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <registerservices.hxx>
class PathService : public ::cppu::WeakImplHelper2< css::frame::XConfigManager, css::lang::XServiceInfo > class PathService : public ::cppu::WeakImplHelper2< css::frame::XConfigManager, css::lang::XServiceInfo >
{ {
......
...@@ -25,20 +25,11 @@ ...@@ -25,20 +25,11 @@
#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/XRegistryKey.hpp>
#include <svl/svldllapi.h> #include <svl/svldllapi.h>
#include <registerservices.hxx>
using css::uno::Reference; using css::uno::Reference;
using css::uno::Sequence; using css::uno::Sequence;
#define DECLARE_CREATEINSTANCE( ImplName ) \
Reference< css::uno::XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& );
DECLARE_CREATEINSTANCE( SvNumberFormatterServiceObj )
DECLARE_CREATEINSTANCE( SvNumberFormatsSupplierServiceObject )
DECLARE_CREATEINSTANCE( PathService )
extern "C" extern "C"
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment