summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-03-31 14:25:58 +0200
committerMichael Stahl <mstahl@redhat.com>2015-03-31 20:08:55 +0200
commitaec3466c3e3d257a8e6d4af81b634a6addbc87bd (patch)
treee5c5e1791b470b4e0e04220ebacadf927bed5658 /sw
parent5db69fcd9d236756c6588cb327510679cd41e9bf (diff)
sw: remove pointless wrtsh/docsh.cxx file
SwDocShell already has 4 or 5 other cxx files. Change-Id: I591d6e5d7ebf5727b4a760add2eeea04c3ca5abe
Diffstat (limited to 'sw')
-rw-r--r--sw/Library_sw.mk1
-rw-r--r--sw/source/uibase/app/docsh.cxx5
-rw-r--r--sw/source/uibase/wrtsh/docsh.cxx19
3 files changed, 5 insertions, 20 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index d27dbf6d7b08..ceaf6eb6fe04 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -747,7 +747,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/uibase/web/wtextsh \
sw/source/uibase/web/wview \
sw/source/uibase/wrtsh/delete \
- sw/source/uibase/wrtsh/docsh \
sw/source/uibase/wrtsh/move \
sw/source/uibase/wrtsh/navmgr \
sw/source/uibase/wrtsh/select \
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 0150587ee5a6..75f8fcb57f33 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1112,6 +1112,11 @@ void SwDocShell::CancelTransfers()
SfxObjectShell::CancelTransfers();
}
+SwEditShell * SwDocShell::GetEditShell()
+{
+ return m_pWrtShell;
+}
+
SwFEShell* SwDocShell::GetFEShell()
{
return m_pWrtShell;
diff --git a/sw/source/uibase/wrtsh/docsh.cxx b/sw/source/uibase/wrtsh/docsh.cxx
deleted file mode 100644
index f5e871ca5f70..000000000000
--- a/sw/source/uibase/wrtsh/docsh.cxx
+++ /dev/null
@@ -1,19 +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/.
- */
-
-#include <sal/config.h>
-
-#include <docsh.hxx>
-#include <wrtsh.hxx>
-
-SwEditShell * SwDocShell::GetEditShell() {
- return m_pWrtShell;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */