summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/Library_msword.mk1
-rw-r--r--sw/Library_sw.mk1
-rw-r--r--sw/Library_swd.mk1
-rw-r--r--sw/Library_swui.mk1
-rw-r--r--sw/inc/sw.mk40
-rw-r--r--sw/inc/swpre.mk46
-rw-r--r--sw/source/ui/app/apphdl.cxx1
-rw-r--r--sw/source/ui/shells/basesh.cxx3
-rw-r--r--sw/source/ui/uiview/srcview.cxx4
-rw-r--r--sw/source/ui/uiview/view0.cxx6
-rw-r--r--sw/source/ui/web/wview.cxx6
11 files changed, 0 insertions, 110 deletions
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index ee33da85561f..d86c67470f8b 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_set_include,msword,\
$(eval $(call gb_Library_set_defs,msword,\
$$(DEFS) \
- -DACCESSIBLE_LAYOUT \
))
$(eval $(call gb_Library_add_linked_libs,msword,\
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index cc1df51d2dba..42333f828752 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_set_include,sw,\
$(eval $(call gb_Library_set_defs,sw,\
$$(DEFS) \
- -DACCESSIBLE_LAYOUT \
-DSW_DLLIMPLEMENTATION \
))
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 17511d3bf4ed..136053975326 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_set_include,swd,\
$(eval $(call gb_Library_set_defs,swd,\
$$(DEFS) \
- -DACCESSIBLE_LAYOUT \
))
$(eval $(call gb_Library_add_linked_libs,swd,\
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 12227c9a0ae8..dcd125a911f8 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Library_set_include,swui,\
$(eval $(call gb_Library_set_defs,swui,\
$$(DEFS) \
- -DACCESSIBLE_LAYOUT \
))
$(eval $(call gb_Library_add_linked_libs,swui,\
diff --git a/sw/inc/sw.mk b/sw/inc/sw.mk
deleted file mode 100644
index c14f5abc8383..000000000000
--- a/sw/inc/sw.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-# CDEFS=$(CDEFS) -DXXX
-
-# Bereiche aktivieren
-
-#CDEFS+=-DXML_CORE_API
-CDEFS+=-DACCESSIBLE_LAYOUT
-
-# define SW_DLLIMPLEMENTATION (see @ swdllapi.h)
-.IF "$(MAKING_LIBMSWORD)" != "TRUE"
-CDEFS += -DSW_DLLIMPLEMENTATION
-.ENDIF
-
-VISIBILITY_HIDDEN=TRUE
diff --git a/sw/inc/swpre.mk b/sw/inc/swpre.mk
deleted file mode 100644
index b19440a01a55..000000000000
--- a/sw/inc/swpre.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-
-#======================================================================
-# standardmaessig mit Optimierung, muss explizit mit nopt=t ausgeschaltet
-# werden, wenn nicht gewuenscht
-#----------------------------------------------------------------------
-
-.IF "$(nopt)"!="" || "$(NOPT)"!=""
-nopt=true
-NOPT=TRUE
-optimize=
-OPTIMIZE=
-.ELSE
-.IF "$(debug)$(DEBUG)"==""
-optimize=true
-OPTIMIZE=TRUE
-.ENDIF
-.ENDIF
-
-
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 653208aaf250..c320b29a9a23 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -135,7 +135,6 @@ using namespace ::com::sun::star;
#define _ExecAddress ExecOther
#define _StateAddress StateOther
#include <sfx2/msg.hxx>
-#include <svx/svxslots.hxx>
#include "swslots.hxx"
#include <cfgid.h>
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 15c97f67c847..017cf892ecaf 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -143,9 +143,6 @@ static BYTE nPagePos;
static BYTE nHeaderPos;
static BYTE nFooterPos;
-#define Interior
-#include <svx/svxslots.hxx>
-
#define SwBaseShell
#define Shadow
#include <sfx2/msg.hxx>
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index af7e12629a73..5c42aa94d470 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -90,10 +90,6 @@
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <sfx2/filedlghelper.hxx>
#define SwSrcView
-#define SearchSettings
-#define _ExecSearch Execute
-#define _StateSearch GetState
-#include <svx/svxslots.hxx>
#include "swslots.hxx"
#include <unomid.h>
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 84000c3ae049..26a61cdb4e59 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -66,11 +66,6 @@
#define OLEObjects
#define SwView
-#define SearchAttributes
-#define ReplaceAttributes
-#define SearchSettings
-#define _ExecSearch ExecSearch
-#define _StateSearch StateSearch
#define Frames
#define Graphics
#define Tables
@@ -90,7 +85,6 @@
#define WebListInTable
#define TextPage
#include <sfx2/msg.hxx>
-#include <svx/svxslots.hxx>
#include "swslots.hxx"
#include <PostItMgr.hxx>
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index d1e7fe672a38..30a33cca1077 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -70,11 +70,6 @@
#include <shells.hrc>
#define SwWebView
-#define SearchAttributes
-#define ReplaceAttributes
-#define SearchSettings
-#define _ExecSearch ExecSearch
-#define _StateSearch StateSearch
#define Frames
#define Graphics
#define OLEObjects
@@ -89,7 +84,6 @@
#define ListInText
#define ListInTable
#define Page
-#include <svx/svxslots.hxx>
#include <swslots.hxx>