Author: arist
Date: Thu Nov 15 00:05:42 2012
New Revision: 1409587
URL: http://svn.apache.org/viewvc?rev=1409587&view=rev
Log:
gnumake4_134_0c13175d5e5e.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1302888427 0
# Node ID 0c13175d5e5e8ef71f9c5cf969773a999f1f65a6
# Parent 1dabf718a032ede076a0409d5efeed104ee9d835
gnumake4: #i117845#: sw: do not link objects into two libraries
Added:
incubator/ooo/branches/gbuild/main/sw/inc/swddllapi.h
Modified:
incubator/ooo/branches/gbuild/main/sw/Library_sw.mk
incubator/ooo/branches/gbuild/main/sw/Library_swd.mk
incubator/ooo/branches/gbuild/main/sw/Library_swui.mk
incubator/ooo/branches/gbuild/main/sw/inc/iodetect.hxx
incubator/ooo/branches/gbuild/main/sw/source/filter/basflt/iodetect.cxx
Modified: incubator/ooo/branches/gbuild/main/sw/Library_sw.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_sw.mk?rev=1409587&r1=1409586&r2=1409587&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_sw.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_sw.mk Thu Nov 15 00:05:42 2012
@@ -71,6 +71,7 @@ $(eval $(call gb_Library_add_linked_libs
svt \
svx \
svxcore \
+ swd \
tk \
tl \
ucbhelper \
@@ -472,7 +473,6 @@ $(eval $(call gb_Library_add_exception_o
sw/source/filter/ascii/wrtasc \
sw/source/filter/basflt/docfact \
sw/source/filter/basflt/fltini \
- sw/source/filter/basflt/iodetect \
sw/source/filter/basflt/shellio \
sw/source/filter/html/SwAppletImpl \
sw/source/filter/html/css1atr \
Modified: incubator/ooo/branches/gbuild/main/sw/Library_swd.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_swd.mk?rev=1409587&r1=1409586&r2=1409587&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_swd.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_swd.mk Thu Nov 15 00:05:42
2012
@@ -41,6 +41,10 @@ $(eval $(call gb_Library_add_api,swd,\
offapi \
))
+$(eval $(call gb_Library_add_defs,swd,\
+ -DSWD_DLLIMPLEMENTATION \
+))
+
$(eval $(call gb_Library_add_linked_libs,swd,\
comphelper \
cppu \
@@ -59,7 +63,6 @@ $(eval $(call gb_Library_add_linked_libs
))
$(eval $(call gb_Library_add_exception_objects,swd,\
- sw/source/core/except/errhdl \
sw/source/filter/basflt/iodetect \
sw/source/ui/uno/detreg \
sw/source/ui/uno/swdet2 \
Modified: incubator/ooo/branches/gbuild/main/sw/Library_swui.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/Library_swui.mk?rev=1409587&r1=1409586&r2=1409587&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/Library_swui.mk (original)
+++ incubator/ooo/branches/gbuild/main/sw/Library_swui.mk Thu Nov 15 00:05:42
2012
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
svx \
svxcore \
sw \
+ swd \
tk \
tl \
ucbhelper \
Modified: incubator/ooo/branches/gbuild/main/sw/inc/iodetect.hxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/inc/iodetect.hxx?rev=1409587&r1=1409586&r2=1409587&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/inc/iodetect.hxx (original)
+++ incubator/ooo/branches/gbuild/main/sw/inc/iodetect.hxx Thu Nov 15 00:05:42
2012
@@ -30,7 +30,7 @@
#include <osl/endian.h>
#include <errhdl.hxx> // for ASSERT
#include <tools/string.hxx>
-#include <swdllapi.h>
+#include <swddllapi.h>
#define FILTER_RTF "RTF" // RTF-Filter
#define sRtfWH "WH_RTF"
@@ -82,7 +82,7 @@ enum ReaderWriterEnum {
MAXFILTER
};
-extern SwIoDetect aFilterDetect[];
+extern SWD_DLLPUBLIC SwIoDetect aFilterDetect[];
// Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
// des Writer 3.0. Alles ist statisch. Alle u.a. Filternamen sind die
@@ -93,13 +93,15 @@ class SwIoSystem
{
public:
// suche ueber den internen FormatNamen den Filtereintrag
- SW_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String&
rFormat,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFilterOfFormat( const String& rFormat,
const SfxFilterContainer* pCnt = 0 );
// Feststellen des zu verwendenden Filters fuer die uebergebene
// Datei. Der Filtername wird zurueckgeliefert. Konnte kein Filter
// zurueckgeliefert werden, wird der Name des ASCII-Filters geliefert!
- static const SfxFilter* GetFileFilter( const String& rFileName,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFileFilter( const String& rFileName,
const String& rPrefFltName,
SfxMedium* pMedium = 0 );
@@ -111,13 +113,15 @@ 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);
- 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 bool IsDetectableW4W(const String& rFileName, const String&
rUserData);
static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong
nLen );
- static const String GetSubStorageName( const SfxFilter& rFltr );
+ SWD_DLLPUBLIC static const String
+ GetSubStorageName( const SfxFilter& rFltr );
};
#endif
Added: incubator/ooo/branches/gbuild/main/sw/inc/swddllapi.h
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/inc/swddllapi.h?rev=1409587&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/inc/swddllapi.h (added)
+++ incubator/ooo/branches/gbuild/main/sw/inc/swddllapi.h Thu Nov 15 00:05:42
2012
@@ -0,0 +1,13 @@
+#ifndef INCLUDED_SWDDLLAPI_H
+#define INCLUDED_SWDDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(SWD_DLLIMPLEMENTATION)
+#define SWD_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define SWD_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define SWD_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_SWDDLLAPI_H */
Modified:
incubator/ooo/branches/gbuild/main/sw/source/filter/basflt/iodetect.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sw/source/filter/basflt/iodetect.cxx?rev=1409587&r1=1409586&r2=1409587&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sw/source/filter/basflt/iodetect.cxx
(original)
+++ incubator/ooo/branches/gbuild/main/sw/source/filter/basflt/iodetect.cxx Thu
Nov 15 00:05:42 2012
@@ -197,9 +197,9 @@ sal_Bool SwIoSystem::IsValidStgFilter(So
void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong
nBufferLen)
{
- ASSERT(nBytesRead <= nBufferLen - 2,
+ OSL_ENSURE(nBytesRead <= nBufferLen - 2,
"what you read must be less than the max + null termination");
- ASSERT(!(nBufferLen & 0x00000001), "nMaxReadBuf must be an even number");
+ OSL_ENSURE(!(nBufferLen & 0x00000001),"nMaxReadBuf must be an even
number");
if (nBytesRead <= nBufferLen - 2)
{
pBuffer[nBytesRead] = '\0';
