diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-20 16:55:24 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-23 04:02:14 +0100 |
| commit | 310eb66522ff30492e8b3cd86dbafaeb52cdff90 (patch) | |
| tree | e9b6fa2c114520c5c6ba88d76ac30387ab7b21f1 /sw | |
| parent | 96c7fff36eb2ed21bba604b3c0c376559e14539c (diff) | |
inline stream operator and remove object
Change-Id: I9df9a56eca662c6adf0a2cf4ef25a917da8dc609
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/Library_sw.mk | 1 | ||||
| -rw-r--r-- | sw/inc/ndindex.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/docnode/ndindex.cxx | 28 |
3 files changed, 4 insertions, 30 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index f9a4e037f163..2af35f21e06f 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -224,7 +224,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/core/docnode/cancellablejob \ sw/source/core/docnode/finalthreadmanager \ sw/source/core/docnode/ndcopy \ - sw/source/core/docnode/ndindex \ sw/source/core/docnode/ndnotxt \ sw/source/core/docnode/ndnum \ sw/source/core/docnode/ndsect \ diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index 72f28de07124..f31c851ad1f8 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -124,7 +124,10 @@ public: SwNode& GetNode() const { return *pNd; } }; -std::ostream &operator <<(std::ostream& s, const SwNodeIndex& index); +inline std::ostream &operator <<(std::ostream& s, const SwNodeIndex& index) +{ + return s << "SwNodeIndex (node " << index.GetIndex() << ")"; +}; // SwRange diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx deleted file mode 100644 index eed90809703e..000000000000 --- a/sw/source/core/docnode/ndindex.cxx +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "ndindex.hxx" - - -std::ostream &operator <<(std::ostream& s, const SwNodeIndex& index) -{ - return s << "SwNodeIndex (node " << index.GetIndex() << ")"; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |