summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-05-07 19:00:10 +0200
committerMichael Stahl <mstahl@redhat.com>2013-05-08 17:49:55 +0200
commit32b9ff886614c1afe117ffd4c1b8807582913725 (patch)
treebc5c4d513d3556bbdd358351579752eaf57b84d5
parent429a850d0d84176dfc1f952ec8c9d08881cf1a1c (diff)
svx: remove Package_sdi
Change-Id: I0c648ca1b1f3cc22244d660e032bacbdbe0f642e
-rw-r--r--basctl/Library_basctl.mk1
-rw-r--r--basctl/sdi/basslots.sdi6
-rw-r--r--sc/Library_sc.mk1
-rw-r--r--sc/sdi/scslots.sdi6
-rw-r--r--sd/Library_sd.mk2
-rw-r--r--sd/sdi/sdgslots.sdi6
-rw-r--r--sd/sdi/sdslots.sdi6
-rw-r--r--starmath/Library_sm.mk1
-rw-r--r--starmath/sdi/smslots.sdi6
-rw-r--r--svx/Library_svxcore.mk4
-rw-r--r--svx/Module_svx.mk1
-rw-r--r--svx/Package_sdi.mk25
-rw-r--r--sw/Library_sw.mk1
-rw-r--r--sw/sdi/swslots.sdi6
14 files changed, 24 insertions, 48 deletions
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 3b4f26f46d42..c008ad6459f5 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))
$(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))
$(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
+ -I$(SRCDIR)/svx/sdi \
-I$(SRCDIR)/sfx2/sdi \
$$(INCLUDE) \
))
diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi
index f4c443f46cae..9235fd8ce428 100644
--- a/basctl/sdi/basslots.sdi
+++ b/basctl/sdi/basslots.sdi
@@ -28,9 +28,9 @@ SlotIdFile( "basslots.hrc" )
//=========================================================================
include "sfxitems.sdi"
include "sfx.sdi"
- include "svx/svxitems.sdi"
- include "svx/xoitems.sdi"
- include "svx/svx.sdi"
+ include "svxitems.sdi"
+ include "xoitems.sdi"
+ include "svx.sdi"
include "baside.sdi"
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 7ee05574a19f..2903aa67525d 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -589,6 +589,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
$(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
-I$(SRCDIR)/sc/inc \
-I$(SRCDIR)/sc/sdi \
+ -I$(SRCDIR)/svx/sdi \
-I$(SRCDIR)/sfx2/sdi \
$$(INCLUDE) \
))
diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi
index 27bc8a35d83b..7ef3eecbd0af 100644
--- a/sc/sdi/scslots.sdi
+++ b/sc/sdi/scslots.sdi
@@ -42,9 +42,9 @@ ModulePrefix( "Sc" )
// bei Problemen ggF. "von Hand" includen (=Copy/Paste)
include "sfxitems.sdi"
include "sfx.sdi"
- include "svx/svxitems.sdi"
- include "svx/xoitems.sdi"
- include "svx/svx.sdi"
+ include "svxitems.sdi"
+ include "xoitems.sdi"
+ include "svx.sdi"
include "scalc.sdi"
include "docsh.sdi"
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 8e21e8ccfd85..2efd42acdff5 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdslots,sd/sdi/sdslots))
$(eval $(call gb_SdiTarget_set_include,sd/sdi/sdslots,\
-I$(SRCDIR)/sd/inc \
-I$(SRCDIR)/sd/sdi \
+ -I$(SRCDIR)/svx/sdi \
-I$(SRCDIR)/sfx2/sdi \
$$(INCLUDE) \
))
@@ -25,6 +26,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sd/sdi/sdgslots,sd/sdi/sdgslots))
$(eval $(call gb_SdiTarget_set_include,sd/sdi/sdgslots,\
-I$(SRCDIR)/sd/inc \
-I$(SRCDIR)/sd/sdi \
+ -I$(SRCDIR)/svx/sdi \
-I$(SRCDIR)/sfx2/sdi \
$$(INCLUDE) \
))
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index e3fe725f4583..01e7de10a7ae 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
@@ -27,9 +27,9 @@ ModulePrefix( "Sd" )
{
include "sfxitems.sdi"
include "sfx.sdi"
- include "svx/svxitems.sdi"
- include "svx/xoitems.sdi"
- include "svx/svx.sdi"
+ include "svxitems.sdi"
+ include "xoitems.sdi"
+ include "svx.sdi"
item UINT16 TbxImageItem;
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index ab0aa38112cf..7070cff8482f 100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -28,9 +28,9 @@ ModulePrefix( "Sd" )
{
include "sfxitems.sdi"
include "sfx.sdi"
- include "svx/svxitems.sdi"
- include "svx/xoitems.sdi"
- include "svx/svx.sdi"
+ include "svxitems.sdi"
+ include "xoitems.sdi"
+ include "svx.sdi"
item UINT16 TbxImageItem;
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 4bf21ef7fcd5..342190b70ffb 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
$(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
-I$(SRCDIR)/starmath/inc \
-I$(SRCDIR)/starmath/sdi \
+ -I$(SRCDIR)/svx/sdi \
-I$(SRCDIR)/sfx2/sdi \
$$(INCLUDE) \
))
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 1bea1685b6a5..5291ca1c40e0 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -30,9 +30,9 @@ StarMath
{
include "sfxitems.sdi"
include "sfx.sdi"
- include "svx/svxitems.sdi"
- include "svx/xoitems.sdi"
- include "svx/svx.sdi"
+ include "svxitems.sdi"
+ include "xoitems.sdi"
+ include "svx.sdi"
include "smath.sdi"
interface StarMath
[
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 19e0551b3e53..e23ae2ca8a73 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
$(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
-$(eval $(call gb_Library_use_packages,svxcore,\
- svx_sdi \
-))
-
$(eval $(call gb_Library_use_custom_headers,svxcore,\
officecfg/registry \
))
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 093d11f830cc..9a08fc40dc14 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,svx,\
AllLangResTarget_gal \
AllLangResTarget_textconversiondlgs \
Package_globlmn_hrc \
- Package_sdi \
UIConfig_svx \
))
diff --git a/svx/Package_sdi.mk b/svx/Package_sdi.mk
deleted file mode 100644
index 7d0927d70069..000000000000
--- a/svx/Package_sdi.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 .
-#
-
-$(eval $(call gb_Package_Package,svx_sdi,$(SRCDIR)/svx/sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svx.sdi,svx.sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svxitems.sdi,svxitems.sdi))
-$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/xoitems.sdi,xoitems.sdi))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index daf8b5f8e8dd..7727862be114 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -743,6 +743,7 @@ $(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/sdi \
+ -I$(SRCDIR)/svx/sdi \
-I$(SRCDIR)/sfx2/sdi \
$$(INCLUDE) \
))
diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi
index 6d2a0602d2dd..fa1e7df30edc 100644
--- a/sw/sdi/swslots.sdi
+++ b/sw/sdi/swslots.sdi
@@ -28,9 +28,9 @@ ModulePrefix( "Sw" )
{
include "sfxitems.sdi"
include "sfx.sdi"
- include "svx/svxitems.sdi"
- include "svx/xoitems.sdi"
- include "svx/svx.sdi"
+ include "svxitems.sdi"
+ include "xoitems.sdi"
+ include "svx.sdi"
item String TbxDummyItem;
/*