summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rwxr-xr-xsw/JunitTest_sw_complex.mk2
-rwxr-xr-xsw/JunitTest_sw_unoapi.mk2
-rw-r--r--sw/Library_msword.mk7
-rw-r--r--sw/Library_sw.mk8
-rw-r--r--sw/Library_swd.mk4
-rw-r--r--sw/Library_swui.mk4
-rw-r--r--sw/Library_vbaswobj.mk7
-rw-r--r--sw/inc/iodetect.hxx12
-rw-r--r--sw/qa/complex/accessibility/makefile.mk50
-rw-r--r--sw/qa/complex/checkColor/makefile.mk50
-rw-r--r--sw/source/core/doc/doclay.cxx.rej2
11 files changed, 19 insertions, 129 deletions
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 0d59a5631a4d..f740014ef6cb 100755
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,sw_complex))
+$(eval $(call gb_JunitTest_JunitTest,sw_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sw_complex,\
$$(DEFS) \
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk
index 8366c20226ea..d148319a589d 100755
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
$$(DEFS) \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 9c41a56d9255..e90639e18104 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -43,10 +43,6 @@ $(eval $(call gb_Library_set_include,msword,\
-I$(OUTDIR)/inc/sw \
))
-$(eval $(call gb_Library_set_defs,msword,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,msword,\
basegfx \
comphelper \
@@ -55,7 +51,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
editeng \
i18nisolang1 \
i18nutil \
- icuuc \
msfilter \
sal \
sax \
@@ -76,6 +71,8 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,msword,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/rtf/rtffld \
sw/source/filter/rtf/rtffly \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index f3e53715deb0..a2a555af9d01 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -47,8 +47,7 @@ $(eval $(call gb_Library_set_include,sw,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,sw,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sw,\
-DSW_DLLIMPLEMENTATION \
))
@@ -62,7 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
editeng \
i18nisolang1 \
i18nutil \
- icuuc \
lng \
sal \
salhelper \
@@ -73,7 +71,7 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
svt \
svx \
svxcore \
- swd \
+ swd \
tk \
tl \
ucbhelper \
@@ -85,6 +83,8 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,sw,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/SwNumberTree/SwNodeNum \
sw/source/core/SwNumberTree/SwNumberTree \
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 0b1ca39f642f..067adb7e2757 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -41,8 +41,8 @@ $(eval $(call gb_Library_set_include,swd,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,swd,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,swd,\
+ -DSWD_DLLIMPLEMENTATION \
-DSWD_DLLIMPLEMENTATION \
))
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 0b5c708b6a28..c46b6035347a 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -39,10 +39,6 @@ $(eval $(call gb_Library_set_include,swui,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,swui,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,swui,\
comphelper \
cppu \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index d76781e83395..42a1c9115b5d 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -136,11 +136,4 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\
sw/source/ui/vba/wordvbahelper \
))
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_set_ldflags,vbaswobj,\
- $$(LDFLAGS) \
- -Wl$(COMMA)-z$(COMMA)noexecstack \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 754cf390325c..cc58b29a24b3 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -97,13 +97,15 @@ class SwIoSystem
{
public:
// find for an internal format name the corresponding filter entry
- SWD_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFilterOfFormat( const String& rFormat,
const SfxFilterContainer* pCnt = 0 );
// Detect for the given file which filter should be used. The filter name
// is returned. If no filter could be found, the name of the ASCII filter
// is returned!
- SWD_DLLPUBLIC static const SfxFilter* GetFileFilter( const String& rFileName,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFileFilter( const String& rFileName,
const String& rPrefFltName,
SfxMedium* pMedium = 0 );
@@ -115,12 +117,14 @@ public:
static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& );
static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
- SWD_DLLPUBLIC static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
+ SWD_DLLPUBLIC static bool
+ IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen );
- SWD_DLLPUBLIC static const String GetSubStorageName( const SfxFilter& rFltr );
+ SWD_DLLPUBLIC static const String
+ GetSubStorageName( const SfxFilter& rFltr );
};
#endif
diff --git a/sw/qa/complex/accessibility/makefile.mk b/sw/qa/complex/accessibility/makefile.mk
deleted file mode 100644
index 06e7c6a70408..000000000000
--- a/sw/qa/complex/accessibility/makefile.mk
+++ /dev/null
@@ -1,50 +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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sw
-TARGET = qa_complex_accessibility
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/accessibility
-JAVATESTFILES = AccessibleRelationSet.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sw/qa/complex/checkColor/makefile.mk b/sw/qa/complex/checkColor/makefile.mk
deleted file mode 100644
index e5b368083ada..000000000000
--- a/sw/qa/complex/checkColor/makefile.mk
+++ /dev/null
@@ -1,50 +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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sw
-TARGET = qa_complex_checkColor
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/checkColor
-JAVATESTFILES = CheckChangeColor.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sw/source/core/doc/doclay.cxx.rej b/sw/source/core/doc/doclay.cxx.rej
index a425d2a70914..66b63312117c 100644
--- a/sw/source/core/doc/doclay.cxx.rej
+++ b/sw/source/core/doc/doclay.cxx.rej
@@ -3,5 +3,5 @@
@@ -2357,4 +2357,4 @@
return aAllLayouts;
}//swmod 070825
-
+
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 13:38:04 +0000