diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-27 11:24:10 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-27 11:24:10 +0000 |
| commit | 01d72b6647f7d40223c44884563a5e489d7f20e7 (patch) | |
| tree | 9b6c4e999cea7d8ac58b03066d86a96ed292523d | |
| parent | a694f788b723e08c9977fdeb80113095939c6a89 (diff) | |
CWS-TOOLING: integrate CWS sb107
2009-04-14 13:09:13 +0200 sb r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46)
2009-04-06 14:11:54 +0200 sb r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein
2009-03-31 16:40:23 +0200 sb r270287 : decrease collisions in hashCode computation
2009-03-30 11:48:39 +0200 sb r270207 : #i100668# corrected explicit template instantiation
2009-03-26 14:16:26 +0100 sb r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789
2009-03-26 10:52:51 +0100 sb r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057
2009-03-26 10:46:36 +0100 sb r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value.
2009-03-25 16:53:39 +0100 sb r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini
2009-03-25 15:29:12 +0100 sb r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets)
2009-03-25 15:17:10 +0100 sb r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6
2009-03-25 14:15:23 +0100 sb r270023 : added svn:ignore
2009-03-25 10:25:08 +0100 sb r270002 : #i10000# copied over trunk -c 269820
2009-03-23 10:16:00 +0100 sb r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44)
2009-03-20 11:22:27 +0100 sb r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists
2009-03-20 09:21:32 +0100 sb r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems).
2009-03-19 11:34:56 +0100 sb r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive
2009-03-19 11:32:20 +0100 sb r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type
2009-03-12 10:39:08 +0100 sb r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831
2009-03-04 17:25:16 +0100 sb r268849 : #i99880# missing AUGMENT_LIBRARY_PATH
2009-02-25 17:54:34 +0100 sb r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42)
2009-02-25 09:23:15 +0100 sb r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc)
2009-02-23 10:02:25 +0100 sb r268344 : #i99519 removed unnecessary library dependencies
2009-02-18 17:54:24 +0100 sb r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds)
2009-02-18 17:50:34 +0100 sb r268249 : avoid erroneous warning that control reaches end of non-void function
2009-02-18 17:33:53 +0100 sb r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>
41 files changed, 174 insertions, 270 deletions
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk index adeca824e2..67aa2135d4 100644 --- a/avmedia/util/makefile.mk +++ b/avmedia/util/makefile.mk @@ -58,7 +58,7 @@ LIB1FILES=\ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1IMPLIB=i$(TARGET) -SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(SOTLIB) $(VOSLIB) +SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(VOSLIB) SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1LIBS=$(SLB)$/$(TARGET).lib diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index df85e63f5e..1b45d28502 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -527,13 +527,5 @@ PCodeBuffConvertor<T,S>::convert() m_nCnvtdSize = static_cast<S>( aTrnsfrmer.buffer().GetSize() ); } -void NeverRunsEver() -{ - // force instatiation of templates... I dunno why, but I have to do - // this to force instatiation of the template. Otherwise using the template - // in another code module results in link errors :-( - PCodeBuffConvertor< UINT16, UINT32 > aInst1(0,0); - aInst1.convert(); - PCodeBuffConvertor< UINT32, UINT16 > aInst2(0,0); - aInst2.convert(); -} +template class PCodeBuffConvertor< UINT16, UINT32 >; +template class PCodeBuffConvertor< UINT32, UINT16 >; diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk index ed092783ac..056e5c1617 100644 --- a/connectivity/source/cpool/makefile.mk +++ b/connectivity/source/cpool/makefile.mk @@ -66,7 +66,6 @@ SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(VOSLIB) \ - $(COMPHELPERLIB) \ $(DBTOOLSLIB) \ $(SALLIB) diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk index 149aab4ebf..59f3238b4f 100644 --- a/connectivity/source/drivers/adabas/makefile.mk +++ b/connectivity/source/drivers/adabas/makefile.mk @@ -89,7 +89,6 @@ SHL1STDLIBS=\ $(DBTOOLSLIB) \ $(TOOLSLIB) \ $(ODBCBASELIB) \ - $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ $(COMPHELPERLIB) diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index a45255cc2b..08d8342363 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -72,14 +72,10 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(VOSLIB) \ $(SVLLIB) \ - $(VCLLIB) \ $(TOOLSLIB) \ - $(SVTOOLLIB) \ - $(UCBHELPERLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ $(DBFILELIB) \ - $(UNOTOOLSLIB) \ $(COMPHELPERLIB) diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk index 4e2535c3bf..7a827b86d4 100644 --- a/connectivity/source/drivers/dbase/makefile.mk +++ b/connectivity/source/drivers/dbase/makefile.mk @@ -105,7 +105,6 @@ SHL1STDLIBS=\ $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ - $(SVTOOLLIB) \ $(UCBHELPERLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk index 897636fc00..dc08137324 100644 --- a/connectivity/source/drivers/evoab/makefile.mk +++ b/connectivity/source/drivers/evoab/makefile.mk @@ -79,10 +79,7 @@ SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(VOSLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ $(UCBHELPERLIB) \ diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk index 0696b29b01..b2a3097c40 100644 --- a/connectivity/source/drivers/file/makefile.mk +++ b/connectivity/source/drivers/file/makefile.mk @@ -82,7 +82,6 @@ SHL1STDLIBS=\ $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ - $(SVTOOLLIB) \ $(UCBHELPERLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk index 83ee3a885b..0cc44de7c5 100644 --- a/connectivity/source/drivers/flat/makefile.mk +++ b/connectivity/source/drivers/flat/makefile.mk @@ -83,13 +83,9 @@ SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(VOSLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ - $(UCBHELPERLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ $(DBFILELIB) \ diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk index 7d13b48550..a97365a4d8 100644 --- a/connectivity/source/drivers/hsqldb/makefile.mk +++ b/connectivity/source/drivers/hsqldb/makefile.mk @@ -98,10 +98,7 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ - $(SALHELPERLIB) \ - $(JVMACCESSLIB) \ $(DBTOOLSLIB) \ $(JVMFWKLIB) \ $(COMPHELPERLIB) \ diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index 2e3443cd95..a842c75c7a 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -108,11 +108,8 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ - $(DBTOOLSLIB) \ - $(COMPHELPERLIB) - + $(DBTOOLSLIB) SHL1DEPN= SHL1IMPLIB= i$(TARGET)$(DLLPOSTFIX) diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk index 0be17c1e91..9a24864a9b 100644 --- a/connectivity/source/drivers/mysql/makefile.mk +++ b/connectivity/source/drivers/mysql/makefile.mk @@ -68,11 +68,9 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(UNOTOOLSLIB) + $(COMPHELPERLIB) SHL1DEPN= diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk index f765f9c0cc..ce16b2f887 100644 --- a/connectivity/source/manager/makefile.mk +++ b/connectivity/source/manager/makefile.mk @@ -62,7 +62,6 @@ SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) SHL1DEPN= diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index df1cfd0e4a..63df07fb69 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -73,6 +73,31 @@ do esac done +# pagein +sd_pagein_args=@pagein-common +for sd_arg in "$@"; do + case ${sd_arg} in + -calc) + sd_pagein_args="${sd_pagein_args} @pagein-calc" + break; + ;; + -draw) + sd_pagein_args="${sd_pagein_args} @pagein-draw" + break; + ;; + -impress) + sd_pagein_args="${sd_pagein_args} @pagein-impress" + break; + ;; + -writer) + sd_pagein_args="${sd_pagein_args} @pagein-writer" + break; + ;; + esac +done +"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \ + ${sd_pagein_args} + # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ @@ -91,39 +116,11 @@ unset XENVIRONMENT # uncomment line below if you encounter problems starting soffice on your system # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS -# pagein -for sd_arg in ${1+"$@"} ; do - case ${sd_arg} in - -calc) - sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc" - break; - ;; - -draw) - sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw" - break; - ;; - -impress) - sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress" - break; - ;; - -writer) - sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer" - break; - ;; - *) - ;; - esac -done - # read database entries for Adabas D if [ -f /etc/adabasrc ]; then . /etc/adabasrc fi -sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common" -"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \ - ${sd_pagein_args} - # Set PATH so that crash_report is found: PATH=$sd_prog${PATH+:$PATH} export PATH diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk index 0eb70999e6..22d28ee00c 100644 --- a/desktop/source/migration/services/makefile.mk +++ b/desktop/source/migration/services/makefile.mk @@ -70,7 +70,6 @@ SHL1STDLIBS= \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ $(JVMFWKLIB) \ - $(COMPHELPERLIB) \ $(XMLSCRIPTLIB) \ $(BERKELEYLIB) diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk index ae804e63da..e269ec44d9 100644 --- a/desktop/source/offacc/makefile.mk +++ b/desktop/source/offacc/makefile.mk @@ -56,7 +56,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) SHL1STDLIBS= \ - $(VCLLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk index 729d460b36..85cbb4d3c9 100644 --- a/desktop/source/pagein/makefile.mk +++ b/desktop/source/pagein/makefile.mk @@ -53,12 +53,10 @@ OBJFILES= \ APP1TARGET=$(TARGET) APP1OBJS=$(OBJFILES) +APP1CODETYPE=C # depends on libc only. STDLIB= -.IF "$(COMNAME)" == "sunpro5" -STDLIB+=-library=no%Crun -.ENDIF # sunpro5 # --- Targets ------------------------------------------------------ diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk index 96f9c6e0a7..3562fad961 100644 --- a/desktop/source/pkgchk/unopkg/makefile.mk +++ b/desktop/source/pkgchk/unopkg/makefile.mk @@ -51,13 +51,7 @@ CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) APP1TARGET = so$/unopkg APP1OBJS = $(OBJFILES) -APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) \ - $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) \ - $(UCBHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) $(VCLLIB) \ - $(DEPLOYMENTMISCLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) \ - $(SOLTLIB) $(ICUUCLIB) $(ICUDATALIB) $(ICULELIB) \ - $(JVMACCESSLIB) $(XMLSCRIPTLIB) $(SALHELPERLIB) \ - $(VOSLIB) $(SOTLIB) $(I18NUTILLIB) $(BERKELEYLIB) +APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) APP1DEPN = $(SHL1TARGETN) APP1NOSAL = TRUE APP1RPATH = BRAND @@ -68,14 +62,7 @@ APP1LINKRES = $(MISC)$/$(TARGET)1.res APP2TARGET = unopkg APP2OBJS = $(OBJFILES) -APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) \ - $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) \ - $(UCBHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) \ - $(VCLLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) \ - $(SOLTLIB) $(ICUUCLIB) $(ICUDATALIB) $(ICULELIB) \ - $(JVMACCESSLIB) $(SALHELPERLIB) \ - $(VOSLIB) $(SOTLIB) $(I18NUTILLIB) \ - $(DEPLOYMENTMISCLIB) $(BERKELEYLIB) $(XMLSCRIPTLIB) +APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) APP2DEPN = $(SHL1TARGETN) APP2NOSAL = TRUE APP2RPATH = BRAND @@ -96,7 +83,6 @@ SHL1STDLIBS = \ $(TOOLSLIB) \ $(VCLLIB) \ $(DEPLOYMENTMISCLIB) - SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index e88fa6ad5a..0447c0c202 100644 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -69,7 +69,6 @@ SHL1STDLIBS= \ $(COMPHELPERLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk index 2ff41eedfe..3e8a55c721 100644 --- a/embeddedobj/source/msole/makefile.mk +++ b/embeddedobj/source/msole/makefile.mk @@ -127,9 +127,6 @@ SHL1STDLIBS+=\ DEF1EXPORTFILE= exports.dxp -.ELSE -SHL1STDLIBS+=\ - -lembobj .ENDIF diff --git a/fileaccess/source/makefile.mk b/fileaccess/source/makefile.mk index ceb808e7a2..36906af4e1 100644 --- a/fileaccess/source/makefile.mk +++ b/fileaccess/source/makefile.mk @@ -56,7 +56,6 @@ DEF1NAME=$(SHL1TARGET) SHL1STDLIBS= \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ - $(VOSLIB) \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk index fbba23313c..e8d5fead90 100644 --- a/formula/util/makefile.mk +++ b/formula/util/makefile.mk @@ -53,15 +53,12 @@ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ $(TOOLSLIB) \ - $(SVLLIB) \ $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(VCLLIB) \ - $(TKLIB) \ - $(VOSLIB) \ $(SALLIB) SHL1IMPLIB=i$(TARGET) @@ -93,17 +90,11 @@ SHL2TARGET=$(TARGET2)$(DLLPOSTFIX) SHL2STDLIBS= \ $(SFXLIB) \ $(SVTOOLLIB) \ - $(TKLIB) \ $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SO2LIB) \ - $(I18NISOLANGLIB) \ $(SALLIB) .IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 86175adafd..cb788809b0 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -187,7 +187,6 @@ SHL3STDLIBS= \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) SHL3DEF= $(MISC)$/$(SHL3TARGET).def @@ -347,7 +346,6 @@ SHL4STDLIBS= \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(UCBHELPERLIB) \ $(I18NISOLANGLIB) diff --git a/idl/util/makefile.mk b/idl/util/makefile.mk index 44dfbad666..8adebf8655 100644 --- a/idl/util/makefile.mk +++ b/idl/util/makefile.mk @@ -52,8 +52,6 @@ APP1RPATH=NONE APP1STDLIBS= \ $(TOOLSLIB) \ - $(VOSLIB) \ - $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(I18NISOLANGLIB) \ $(SALLIB) APP1LIBS= $(LB)$/$(TARGET).lib diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index 36b8c8c131..037f595a5d 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -68,7 +68,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(I18NUTILLIB) \ $(VOSLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ diff --git a/scripting/source/basprov/makefile.mk b/scripting/source/basprov/makefile.mk index 76efc36e2d..2b6fe7faa3 100644 --- a/scripting/source/basprov/makefile.mk +++ b/scripting/source/basprov/makefile.mk @@ -61,7 +61,6 @@ DEF1NAME=$(SHL1TARGET) SHL1STDLIBS= \ $(SFX2LIB) \ $(BASICLIB) \ - $(SVTOOLLIB) \ $(VCLLIB) \ $(TOOLSLIB) \ $(UCBHELPERLIB) \ diff --git a/scripting/source/protocolhandler/makefile.mk b/scripting/source/protocolhandler/makefile.mk index 77dad5e7ff..35440668f6 100644 --- a/scripting/source/protocolhandler/makefile.mk +++ b/scripting/source/protocolhandler/makefile.mk @@ -49,7 +49,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ $(SFXLIB) \ - $(TOOLSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(VCLLIB) \ diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 91b787e062..d93f99bda7 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -99,13 +99,13 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, rStrm << pIndent; ByteString sOut( '<' ); - (((sOut += sHTML_meta) += ' ') - += (bHTTPEquiv ? sHTML_O_httpequiv : sHTML_O_name)) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_meta) += ' ') + += (bHTTPEquiv ? OOO_STRING_SVTOOLS_HTML_O_httpequiv : OOO_STRING_SVTOOLS_HTML_O_name)) += "=\""; rStrm << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rStrm, rName, eDestEnc, pNonConvertableChars ); - ((sOut = "\" ") += sHTML_O_content) += "=\""; + ((sOut = "\" ") += OOO_STRING_SVTOOLS_HTML_O_content) += "=\""; rStrm << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ) << "\">"; @@ -124,7 +124,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, { String aContentType = String::CreateFromAscii( sHTML_MIME_text_html ); aContentType.AppendAscii( pCharSet ); - OutMeta( rStrm, pIndent, sHTML_META_content_type, aContentType, TRUE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, TRUE, eDestEnc, pNonConvertableChars ); } @@ -132,14 +132,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, rStrm << sNewLine; if( pIndent ) rStrm << pIndent; - HTMLOutFuncs::Out_AsciiTag( rStrm, sHTML_title ); + HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title ); if( i_xDocProps.is() ) { const String& rTitle = i_xDocProps->getTitle(); if( rTitle.Len() ) HTMLOutFuncs::Out_String( rStrm, rTitle, eDestEnc, pNonConvertableChars ); } - HTMLOutFuncs::Out_AsciiTag( rStrm, sHTML_title, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, FALSE ); // Target-Frame if( i_xDocProps.is() ) @@ -152,7 +152,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, rStrm << pIndent; ByteString sOut( '<' ); - (((sOut += sHTML_base) += ' ') += sHTML_O_target) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_base) += ' ') += OOO_STRING_SVTOOLS_HTML_O_target) += "=\""; rStrm << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rStrm, rTarget, eDestEnc, pNonConvertableChars ) << "\">"; @@ -162,7 +162,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, // Who we are String sGenerator( SfxResId( STR_HTML_GENERATOR ) ); sGenerator.SearchAndReplaceAscii( "%1", String( DEFINE_CONST_UNICODE( TOOLS_INETDEF_OS ) ) ); - OutMeta( rStrm, pIndent, sHTML_META_generator, sGenerator, FALSE, eDestEnc, pNonConvertableChars ); + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, FALSE, eDestEnc, pNonConvertableChars ); if( i_xDocProps.is() ) { @@ -182,14 +182,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, rBaseURL, rReloadURL)); } - OutMeta( rStrm, pIndent, sHTML_META_refresh, sContent, TRUE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, TRUE, eDestEnc, pNonConvertableChars ); } // Author const String& rAuthor = i_xDocProps->getAuthor(); if( rAuthor.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_author, rAuthor, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, FALSE, eDestEnc, pNonConvertableChars ); // created @@ -199,13 +199,13 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, String sOut = String::CreateFromInt32(aD.GetDate()); sOut += ';'; sOut += String::CreateFromInt32(aT.GetTime()); - OutMeta( rStrm, pIndent, sHTML_META_created, sOut, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, FALSE, eDestEnc, pNonConvertableChars ); // changedby const String& rChangedBy = i_xDocProps->getModifiedBy(); if( rChangedBy.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_changedby, rChangedBy, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, FALSE, eDestEnc, pNonConvertableChars ); // changed @@ -215,26 +215,26 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, sOut = String::CreateFromInt32(aD2.GetDate()); sOut += ';'; sOut += String::CreateFromInt32(aT2.GetTime()); - OutMeta( rStrm, pIndent, sHTML_META_changed, sOut, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, FALSE, eDestEnc, pNonConvertableChars ); // Subject const String& rTheme = i_xDocProps->getSubject(); if( rTheme.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_classification, rTheme, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, FALSE, eDestEnc, pNonConvertableChars ); // Description const String& rComment = i_xDocProps->getDescription(); if( rComment.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_description, rComment, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, FALSE, eDestEnc, pNonConvertableChars); // Keywords String Keywords = ::comphelper::string::convertCommaSeparated( i_xDocProps->getKeywords()); if( Keywords.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_keywords, Keywords, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, FALSE, eDestEnc, pNonConvertableChars); uno::Reference < script::XTypeConverter > xConverter( @@ -301,7 +301,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( { aURL = URIHelper::simpleNormalizedMakeRelative( rBaseURL, aURL ); - ((sOut += ' ') += sHTML_O_src) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_src) += "=\""; rOut << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rOut, aURL, eDestEnc, pNonConvertableChars ); sOut = '\"'; @@ -311,7 +311,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameName") ); if ( (aAny >>= aStr) && aStr.getLength() ) { - ((sOut += ' ') += sHTML_O_name) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; rOut << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rOut, aStr, eDestEnc, pNonConvertableChars ); sOut = '\"'; @@ -320,10 +320,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( sal_Int32 nVal = SIZE_NOT_SET; aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth") ); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) - (((sOut += ' ') += sHTML_O_marginwidth) += '=') += ByteString::CreateFromInt32( nVal ); + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginwidth) += '=') += ByteString::CreateFromInt32( nVal ); aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight") ); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) - (((sOut += ' ') += sHTML_O_marginheight) += '=') += ByteString::CreateFromInt32( nVal ); + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginheight) += '=') += ByteString::CreateFromInt32( nVal ); sal_Bool bVal = sal_True; aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") ); @@ -333,7 +333,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( if ( aAny >>= bVal ) { const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; - (((sOut += ' ') += sHTML_O_scrolling) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_scrolling) += '=') += pStr; } } @@ -345,7 +345,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( if ( aAny >>= bVal ) { const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; - (((sOut += ' ') += sHTML_O_frameborder) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_frameborder) += '=') += pStr; } } diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 1b338c38cb..e70537db6a 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -88,12 +88,12 @@ static HTMLOptionEnum aAreaShapeOptEnums[] = static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] = #endif { - { sHTML_SH_rect, IMAP_OBJ_RECTANGLE }, - { sHTML_SH_rectangle, IMAP_OBJ_RECTANGLE }, - { sHTML_SH_circ, IMAP_OBJ_CIRCLE }, - { sHTML_SH_circle, IMAP_OBJ_CIRCLE }, - { sHTML_SH_poly, IMAP_OBJ_POLYGON }, - { sHTML_SH_polygon, IMAP_OBJ_POLYGON }, + { OOO_STRING_SVTOOLS_HTML_SH_rect, IMAP_OBJ_RECTANGLE }, + { OOO_STRING_SVTOOLS_HTML_SH_rectangle, IMAP_OBJ_RECTANGLE }, + { OOO_STRING_SVTOOLS_HTML_SH_circ, IMAP_OBJ_CIRCLE }, + { OOO_STRING_SVTOOLS_HTML_SH_circle, IMAP_OBJ_CIRCLE }, + { OOO_STRING_SVTOOLS_HTML_SH_poly, IMAP_OBJ_POLYGON }, + { OOO_STRING_SVTOOLS_HTML_SH_polygon, IMAP_OBJ_POLYGON }, { 0, 0 } }; @@ -104,18 +104,18 @@ static HTMLOptionEnum aHTMLMetaNameTable[] = static HTMLOptionEnum __READONLY_DATA aHTMLMetaNameTable[] = #endif { - { sHTML_META_author, HTML_META_AUTHOR }, - { sHTML_META_changed, HTML_META_CHANGED }, - { sHTML_META_changedby, HTML_META_CHANGEDBY }, - { sHTML_META_classification,HTML_META_CLASSIFICATION}, - { sHTML_META_content_type, HTML_META_CONTENT_TYPE }, - { sHTML_META_created, HTML_META_CREATED }, - { sHTML_META_description, HTML_META_DESCRIPTION }, - { sHTML_META_keywords, HTML_META_KEYWORDS }, - { sHTML_META_generator, HTML_META_GENERATOR }, - { sHTML_META_refresh, HTML_META_REFRESH }, - { sHTML_META_sdendnote, HTML_META_SDENDNOTE }, - { sHTML_META_sdfootnote, HTML_META_SDFOOTNOTE }, + { OOO_STRING_SVTOOLS_HTML_META_author, HTML_META_AUTHOR }, + { OOO_STRING_SVTOOLS_HTML_META_changed, HTML_META_CHANGED }, + { OOO_STRING_SVTOOLS_HTML_META_changedby, HTML_META_CHANGEDBY }, + { OOO_STRING_SVTOOLS_HTML_META_classification,HTML_META_CLASSIFICATION}, + { OOO_STRING_SVTOOLS_HTML_META_content_type, HTML_META_CONTENT_TYPE }, + { OOO_STRING_SVTOOLS_HTML_META_created, HTML_META_CREATED }, + { OOO_STRING_SVTOOLS_HTML_META_description, HTML_META_DESCRIPTION }, + { OOO_STRING_SVTOOLS_HTML_META_keywords, HTML_META_KEYWORDS }, + { OOO_STRING_SVTOOLS_HTML_META_generator, HTML_META_GENERATOR }, + { OOO_STRING_SVTOOLS_HTML_META_refresh, HTML_META_REFRESH }, + { OOO_STRING_SVTOOLS_HTML_META_sdendnote, HTML_META_SDENDNOTE }, + { OOO_STRING_SVTOOLS_HTML_META_sdfootnote, HTML_META_SDFOOTNOTE }, { 0, 0 } }; @@ -586,7 +586,7 @@ rtl_TextEncoding SfxHTMLParser::GetEncodingByHttpHeader( SvKeyValueIterator *pHT for( BOOL bCont = pHTTPHeader->GetFirst( aKV ); bCont; bCont = pHTTPHeader->GetNext( aKV ) ) { - if( aKV.GetKey().EqualsIgnoreCaseAscii( sHTML_META_content_type ) ) + if( aKV.GetKey().EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ) ) { if( aKV.GetValue().Len() ) { @@ -622,7 +622,7 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader ) bCont = pHTTPHeader->GetNext( aKV ) ) { if( aKV.GetKey().EqualsIgnoreCaseAscii( - sHTML_META_content_script_type ) ) + OOO_STRING_SVTOOLS_HTML_META_content_script_type ) ) { if( aKV.GetValue().Len() ) { @@ -641,12 +641,12 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader ) aTmp.Erase( 0, 2 ); } - if( aTmp.EqualsIgnoreCaseAscii( sHTML_LG_starbasic ) ) + if( aTmp.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_LG_starbasic ) ) { eScriptType = STARBASIC; aScriptType = DEFINE_CONST_UNICODE(SVX_MACRO_LANGUAGE_STARBASIC); } - if( !aTmp.EqualsIgnoreCaseAscii( sHTML_LG_javascript ) ) + if( !aTmp.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_LG_javascript ) ) { eScriptType = EXTENDED_STYPE; aScriptType = aTmp; diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index d8fdc0fea5..8b1b18c470 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -81,7 +81,6 @@ SHL1USE_EXPORTS=name SHL1STDLIBS+=\ $(FWELIB) \ $(BASICLIB) \ - $(XMLSCRIPTLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ $(VCLLIB) \ diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk index a810a804b8..8089b160fb 100644 --- a/shell/source/unix/sysshell/makefile.mk +++ b/shell/source/unix/sysshell/makefile.mk @@ -66,10 +66,7 @@ DEF1NAME= $(SHL1TARGET) .ENDIF SHL1STDLIBS=$(EXPATASCII3RDLIB)\ - $(SALLIB)\ - $(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(COMPHELPERLIB) + $(SALLIB) SHL1LIBS=$(SLB)$/xmlparser.lib SHL1OBJS=$(SLOFILES) diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx index d380896531..a497b8a5c3 100644 --- a/svx/source/editeng/eehtml.cxx +++ b/svx/source/editeng/eehtml.cxx @@ -719,11 +719,11 @@ void EditHTMLParser::StartPara( BOOL bReal ) { case HTML_O_ALIGN: { - if ( pOption->GetString().CompareIgnoreCaseToAscii( sHTML_AL_right ) == COMPARE_EQUAL ) + if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL ) eAdjust = SVX_ADJUST_RIGHT; - else if ( pOption->GetString().CompareIgnoreCaseToAscii( sHTML_AL_middle ) == COMPARE_EQUAL ) + else if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_middle ) == COMPARE_EQUAL ) eAdjust = SVX_ADJUST_CENTER; - else if ( pOption->GetString().CompareIgnoreCaseToAscii( sHTML_AL_center ) == COMPARE_EQUAL ) + else if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) == COMPARE_EQUAL ) eAdjust = SVX_ADJUST_CENTER; else eAdjust = SVX_ADJUST_LEFT; diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx index b2aee4f9a5..98d8c7eb03 100644 --- a/svx/source/editeng/impedit4.cxx +++ b/svx/source/editeng/impedit4.cxx @@ -388,9 +388,9 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) // RTF-Vorspann... rOutput << '{' ; - rOutput << sRTF_RTF; + rOutput << OOO_STRING_SVTOOLS_RTF_RTF; - rOutput << sRTF_ANSI; + rOutput << OOO_STRING_SVTOOLS_RTF_ANSI; rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252; // Fonttabelle erzeugen und rausschreiben... @@ -425,32 +425,32 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) } } - rOutput << endl << '{' << sRTF_FONTTBL; + rOutput << endl << '{' << OOO_STRING_SVTOOLS_RTF_FONTTBL; sal_uInt16 j; for ( j = 0; j < aFontTable.Count(); j++ ) { SvxFontItem* pFontItem = aFontTable.Get( j ); rOutput << '{'; - rOutput << sRTF_F; + rOutput << OOO_STRING_SVTOOLS_RTF_F; rOutput.WriteNumber( j ); switch ( pFontItem->GetFamily() ) { - case FAMILY_DONTKNOW: rOutput << sRTF_FNIL; + case FAMILY_DONTKNOW: rOutput << OOO_STRING_SVTOOLS_RTF_FNIL; break; - case FAMILY_DECORATIVE: rOutput << sRTF_FDECOR; + case FAMILY_DECORATIVE: rOutput << OOO_STRING_SVTOOLS_RTF_FDECOR; break; - case FAMILY_MODERN: rOutput << sRTF_FMODERN; + case FAMILY_MODERN: rOutput << OOO_STRING_SVTOOLS_RTF_FMODERN; break; - case FAMILY_ROMAN: rOutput << sRTF_FROMAN; + case FAMILY_ROMAN: rOutput << OOO_STRING_SVTOOLS_RTF_FROMAN; break; - case FAMILY_SCRIPT: rOutput << sRTF_FSCRIPT; + case FAMILY_SCRIPT: rOutput << OOO_STRING_SVTOOLS_RTF_FSCRIPT; break; - case FAMILY_SWISS: rOutput << sRTF_FSWISS; + case FAMILY_SWISS: rOutput << OOO_STRING_SVTOOLS_RTF_FSWISS; break; default: break; } - rOutput << sRTF_FPRQ; + rOutput << OOO_STRING_SVTOOLS_RTF_FPRQ; sal_uInt16 nVal = 0; switch( pFontItem->GetPitch() ) { @@ -465,7 +465,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) DBG_ASSERT( eChrSet != 9, "SystemCharSet?!" ); if( RTL_TEXTENCODING_DONTKNOW == eChrSet ) eChrSet = gsl_getSystemTextEncoding(); - rOutput << sRTF_FCHARSET; + rOutput << OOO_STRING_SVTOOLS_RTF_FCHARSET; rOutput.WriteNumber( rtl_getBestWindowsCharsetFromTextEncoding( eChrSet ) ); rOutput << ' '; @@ -489,17 +489,17 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) } aColorList.Insert( new SvxColorItem( (const SvxColorItem&)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_COLOR) ), (sal_uInt32)i ); - rOutput << '{' << sRTF_COLORTBL; + rOutput << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL; for ( j = 0; j < aColorList.Count(); j++ ) { pColorItem = aColorList.GetObject( j ); if ( !j || ( pColorItem->GetValue() != COL_AUTO ) ) { - rOutput << sRTF_RED; + rOutput << OOO_STRING_SVTOOLS_RTF_RED; rOutput.WriteNumber( pColorItem->GetValue().GetRed() ); - rOutput << sRTF_GREEN; + rOutput << OOO_STRING_SVTOOLS_RTF_GREEN; rOutput.WriteNumber( pColorItem->GetValue().GetGreen() ); - rOutput << sRTF_BLUE; + rOutput << OOO_STRING_SVTOOLS_RTF_BLUE; rOutput.WriteNumber( pColorItem->GetValue().GetBlue() ); } rOutput << ';'; @@ -513,14 +513,14 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) sal_uInt16 nStyles = (sal_uInt16)GetStyleSheetPool()->GetStyles().size(); if ( nStyles ) { - rOutput << '{' << sRTF_STYLESHEET; + rOutput << '{' << OOO_STRING_SVTOOLS_RTF_STYLESHEET; for ( sal_uInt16 nStyle = 0; nStyle < nStyles; nStyle++ ) { SfxStyleSheet* pStyle = (SfxStyleSheet*)GetStyleSheetPool()->GetStyles()[ nStyle ].get(); - rOutput << endl << '{' << sRTF_S; + rOutput << endl << '{' << OOO_STRING_SVTOOLS_RTF_S; sal_uInt16 nNumber = (sal_uInt16) (nStyle + 1); rOutput.WriteNumber( nNumber ); @@ -539,7 +539,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) { SfxStyleSheet* pParent = (SfxStyleSheet*)GetStyleSheetPool()->Find( pStyle->GetParent(), pStyle->GetFamily() ); DBG_ASSERT( pParent, "Parent nicht gefunden!" ); - rOutput << sRTF_SBASEDON; + rOutput << OOO_STRING_SVTOOLS_RTF_SBASEDON; nNumber = (sal_uInt16) getStylePos( GetStyleSheetPool()->GetStyles(), pParent ) + 1; rOutput.WriteNumber( nNumber ); } @@ -550,7 +550,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) pNext = (SfxStyleSheet*)GetStyleSheetPool()->Find( pStyle->GetFollow(), pStyle->GetFamily() ); DBG_ASSERT( pNext, "Naechsten nicht gefunden!" ); - rOutput << sRTF_SNEXT; + rOutput << OOO_STRING_SVTOOLS_RTF_SNEXT; nNumber = (sal_uInt16) getStylePos( GetStyleSheetPool()->GetStyles(), pNext ) + 1; rOutput.WriteNumber( nNumber ); @@ -564,7 +564,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) } // Die Pool-Defaults vorweg schreiben... - rOutput << '{' << sRTF_IGNORE << "\\EditEnginePoolDefaults"; + rOutput << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << "\\EditEnginePoolDefaults"; for ( sal_uInt16 nPoolDefItem = EE_PARA_START; nPoolDefItem <= EE_CHAR_END; nPoolDefItem++) { const SfxPoolItem& rItem = aEditDoc.GetItemPool().GetDefaultItem( nPoolDefItem ); @@ -577,14 +577,14 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) // SfxItemSet aTmpSet( GetEmptyItemSet() ); // const SvxFontHeightItem& rDefFontHeight = (const SvxFontHeightItem&)aTmpSet.Get( EE_CHAR_FONTHEIGHT ); // WriteItemAsRTF( rDefFontHeight, rOutput, aFontTable, aColorList ); - // rOutput << '{' << sRTF_IGNORE << "\\EditEnginePoolDefaultHeight}" << endl; + // rOutput << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << "\\EditEnginePoolDefaultHeight}" << endl; // DefTab: MapMode aTwpMode( MAP_TWIP ); sal_uInt16 nDefTabTwps = (sal_uInt16) GetRefDevice()->LogicToLogic( Point( aEditDoc.GetDefTab(), 0 ), &GetRefMapMode(), &aTwpMode ).X(); - rOutput << sRTF_DEFTAB; + rOutput << OOO_STRING_SVTOOLS_RTF_DEFTAB; rOutput.WriteNumber( nDefTabTwps ); rOutput << endl; @@ -602,7 +602,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) if ( pNode->GetStyleSheet() ) { // Nummer der Vorlage - rOutput << sRTF_S; + rOutput << OOO_STRING_SVTOOLS_RTF_S; sal_uInt16 nNumber = (sal_uInt16) getStylePos( GetStyleSheetPool()->GetStyles(), pNode->GetStyleSheet() ) + 1; rOutput.WriteNumber( nNumber ); @@ -727,7 +727,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) nIndex = nIndex + pTextPortion->GetLen(); } - rOutput << sRTF_PAR << sRTF_PARD << sRTF_PLAIN;; + rOutput << OOO_STRING_SVTOOLS_RTF_PAR << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN;; rOutput << endl; } // RTF-Nachspann... @@ -781,15 +781,15 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, { // const ContentNode *pNode = aEditDoc.GetObject( nPara ); - rOutput << sRTF_FI; + rOutput << OOO_STRING_SVTOOLS_RTF_FI; short nTxtFirst = ((const SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst(); nTxtFirst = (short)LogicToTwips( nTxtFirst ); rOutput.WriteNumber( nTxtFirst ); - rOutput << sRTF_LI; + rOutput << OOO_STRING_SVTOOLS_RTF_LI; sal_uInt16 nTxtLeft = static_cast< sal_uInt16 >(((const SvxLRSpaceItem&)rItem).GetTxtLeft()); nTxtLeft = (sal_uInt16)LogicToTwips( nTxtLeft ); rOutput.WriteNumber( nTxtLeft ); - rOutput << sRTF_RI; + rOutput << OOO_STRING_SVTOOLS_RTF_RI; sal_uInt32 nTxtRight = ((const SvxLRSpaceItem&)rItem).GetRight(); nTxtRight = LogicToTwips( nTxtRight); rOutput.WriteNumber( nTxtRight ); @@ -797,11 +797,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, break; case EE_PARA_ULSPACE: { - rOutput << sRTF_SB; + rOutput << OOO_STRING_SVTOOLS_RTF_SB; sal_uInt16 nUpper = ((const SvxULSpaceItem&)rItem).GetUpper(); nUpper = (sal_uInt16)LogicToTwips( nUpper ); rOutput.WriteNumber( nUpper ); - rOutput << sRTF_SA; + rOutput << OOO_STRING_SVTOOLS_RTF_SA; sal_uInt16 nLower = ((const SvxULSpaceItem&)rItem).GetLower(); nLower = (sal_uInt16)LogicToTwips( nLower ); rOutput.WriteNumber( nLower ); @@ -809,7 +809,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, break; case EE_PARA_SBL: { - rOutput << sRTF_SL; + rOutput << OOO_STRING_SVTOOLS_RTF_SL; long nVal = ((const SvxLineSpacingItem&)rItem).GetLineHeight(); char cMult = '0'; if ( ((const SvxLineSpacingItem&)rItem).GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP ) @@ -822,7 +822,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, cMult = '1'; } rOutput.WriteNumber( nVal ); - rOutput << sRTF_SLMULT << cMult; + rOutput << OOO_STRING_SVTOOLS_RTF_SLMULT << cMult; } break; case EE_PARA_JUST: @@ -830,11 +830,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, SvxAdjust eJustification = ((const SvxAdjustItem&)rItem).GetAdjust(); switch ( eJustification ) { - case SVX_ADJUST_CENTER: rOutput << sRTF_QC; + case SVX_ADJUST_CENTER: rOutput << OOO_STRING_SVTOOLS_RTF_QC; break; - case SVX_ADJUST_RIGHT: rOutput << sRTF_QR; + case SVX_ADJUST_RIGHT: rOutput << OOO_STRING_SVTOOLS_RTF_QR; break; - default: rOutput << sRTF_QL; + default: rOutput << OOO_STRING_SVTOOLS_RTF_QL; break; } } @@ -845,7 +845,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, for ( sal_uInt16 i = 0; i < rTabs.Count(); i++ ) { const SvxTabStop& rTab = rTabs[i]; - rOutput << sRTF_TX; + rOutput << OOO_STRING_SVTOOLS_RTF_TX; rOutput.WriteNumber( LogicToTwips( rTab.GetTabPos() ) ); } } @@ -853,7 +853,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, case EE_CHAR_COLOR: { sal_uInt32 n = rColorList.GetId( (const SvxColorItem&)rItem ); - rOutput << sRTF_CF; + rOutput << OOO_STRING_SVTOOLS_RTF_CF; rOutput.WriteNumber( n ); } break; @@ -862,7 +862,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, case EE_CHAR_FONTINFO_CTL: { sal_uInt32 n = rFontTable.GetId( (const SvxFontItem&)rItem ); - rOutput << sRTF_F; + rOutput << OOO_STRING_SVTOOLS_RTF_F; rOutput.WriteNumber( n ); } break; @@ -870,7 +870,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, case EE_CHAR_FONTHEIGHT_CJK: case EE_CHAR_FONTHEIGHT_CTL: { - rOutput << sRTF_FS; + rOutput << OOO_STRING_SVTOOLS_RTF_FS; long nHeight = ((const SvxFontHeightItem&)rItem).GetHeight(); nHeight = LogicToTwips( nHeight ); // Twips => HalfPoints @@ -885,8 +885,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontWeight e = ((const SvxWeightItem&)rItem).GetWeight(); switch ( e ) { - case WEIGHT_BOLD: rOutput << sRTF_B; break; - default: rOutput << sRTF_B << '0'; break; + case WEIGHT_BOLD: rOutput << OOO_STRING_SVTOOLS_RTF_B; break; + default: rOutput << OOO_STRING_SVTOOLS_RTF_B << '0'; break; } } break; @@ -897,10 +897,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontUnderline e = ((const SvxUnderlineItem&)rItem).GetLineStyle(); switch ( e ) { - case UNDERLINE_NONE: rOutput << sRTF_ULNONE; break; - case UNDERLINE_SINGLE: rOutput << sRTF_UL; break; - case UNDERLINE_DOUBLE: rOutput << sRTF_ULDB; break; - case UNDERLINE_DOTTED: rOutput << sRTF_ULD; break; + case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_ULNONE; break; + case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_UL; break; + case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_ULDB; break; + case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_ULD; break; default: break; } @@ -911,10 +911,10 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, FontUnderline e = ((const SvxOverlineItem&)rItem).GetLineStyle(); switch ( e ) { - case UNDERLINE_NONE: rOutput << sRTF_OLNONE; break; - case UNDERLINE_SINGLE: rOutput << sRTF_OL; break; - case UNDERLINE_DOUBLE: rOutput << sRTF_OLDB; break; - case UNDERLINE_DOTTED: rOutput << sRTF_OLD; break; + case UNDERLINE_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_OLNONE; break; + case UNDERLINE_SINGLE: rOutput << OOO_STRING_SVTOOLS_RTF_OL; break; + case UNDERLINE_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_OLDB; break; + case UNDERLINE_DOTTED: rOutput << OOO_STRING_SVTOOLS_RTF_OLD; break; default: break; } @@ -926,8 +926,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, switch ( e ) { case STRIKEOUT_SINGLE: - case STRIKEOUT_DOUBLE: rOutput << sRTF_STRIKE; break; - case STRIKEOUT_NONE: rOutput << sRTF_STRIKE << '0'; break; + case STRIKEOUT_DOUBLE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE; break; + case STRIKEOUT_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_STRIKE << '0'; break; default: break; } @@ -941,8 +941,8 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, switch ( e ) { case ITALIC_OBLIQUE: - case ITALIC_NORMAL: rOutput << sRTF_I; break; - case ITALIC_NONE: rOutput << sRTF_I << '0'; break; + case ITALIC_NORMAL: rOutput << OOO_STRING_SVTOOLS_RTF_I; break; + case ITALIC_NONE: rOutput << OOO_STRING_SVTOOLS_RTF_I << '0'; break; default: break; } @@ -950,7 +950,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, break; case EE_CHAR_OUTLINE: { - rOutput << sRTF_OUTL; + rOutput << OOO_STRING_SVTOOLS_RTF_OUTL; if ( ((const SvxContourItem&)rItem).GetValue() == 0 ) rOutput << '0'; } @@ -959,49 +959,49 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, { USHORT nRelief = ((const SvxCharReliefItem&)rItem).GetValue(); if ( nRelief == RELIEF_EMBOSSED ) - rOutput << sRTF_EMBO; + rOutput << OOO_STRING_SVTOOLS_RTF_EMBO; if ( nRelief == RELIEF_ENGRAVED ) - rOutput << sRTF_IMPR; + rOutput << OOO_STRING_SVTOOLS_RTF_IMPR; } break; case EE_CHAR_EMPHASISMARK: { USHORT nMark = ((const SvxEmphasisMarkItem&)rItem).GetValue(); if ( nMark == EMPHASISMARK_NONE ) - rOutput << sRTF_ACCNONE; + rOutput << OOO_STRING_SVTOOLS_RTF_ACCNONE; else if ( nMark == EMPHASISMARK_SIDE_DOTS ) - rOutput << sRTF_ACCCOMMA; + rOutput << OOO_STRING_SVTOOLS_RTF_ACCCOMMA; else - rOutput << sRTF_ACCDOT; + rOutput << OOO_STRING_SVTOOLS_RTF_ACCDOT; } break; case EE_CHAR_SHADOW: { - rOutput << sRTF_SHAD; + rOutput << OOO_STRING_SVTOOLS_RTF_SHAD; if ( ((const SvxShadowedItem&)rItem).GetValue() == 0 ) rOutput << '0'; } break; case EE_FEATURE_TAB: { - rOutput << sRTF_TAB; + rOutput << OOO_STRING_SVTOOLS_RTF_TAB; } break; case EE_FEATURE_LINEBR: { - rOutput << sRTF_SL; + rOutput << OOO_STRING_SVTOOLS_RTF_SL; } break; case EE_CHAR_KERNING: { - rOutput << sRTF_EXPNDTW; + rOutput << OOO_STRING_SVTOOLS_RTF_EXPNDTW; rOutput.WriteNumber( LogicToTwips( ((const SvxKerningItem&)rItem).GetValue() ) ); } break; case EE_CHAR_PAIRKERNING: { - rOutput << sRTF_KERNING; + rOutput << OOO_STRING_SVTOOLS_RTF_KERNING; rOutput.WriteNumber( ((const SvxAutoKernItem&)rItem).GetValue() ? 1 : 0 ); } break; @@ -1033,9 +1033,9 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, long nUpDown = nFontHeight * Abs( nEsc ) / 100; ByteString aUpDown = ByteString::CreateFromInt32( nUpDown ); if ( nEsc < 0 ) - rOutput << sRTF_DN << aUpDown.GetBuffer(); + rOutput << OOO_STRING_SVTOOLS_RTF_DN << aUpDown.GetBuffer(); else if ( nEsc > 0 ) - rOutput << sRTF_UP << aUpDown.GetBuffer(); + rOutput << OOO_STRING_SVTOOLS_RTF_UP << aUpDown.GetBuffer(); } break; } diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk index 1c8284a19e..703f730433 100644 --- a/svx/source/gengal/makefile.mk +++ b/svx/source/gengal/makefile.mk @@ -58,24 +58,14 @@ APP1TARGET= $(TARGET).bin APP1OBJS= $(OBJFILES) APP1STDLIBS=$(TOOLSLIB) \ - $(VOSLIB) \ $(SO2LIB) \ - $(SVTOOLLIB) \ $(SVLLIB) \ $(COMPHELPERLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ - $(GOODIESLIB) \ - $(SFXLIB) \ - $(SOTLIB) \ $(VCLLIB) \ $(UCBHELPERLIB) \ - $(BASEGFXLIB) $(I18NISOLANGLIB) $(TKLIB) $(UNOTOOLSLIB) $(I18NUTILLIB) \ - $(ICUUCLIB) $(JVMFWKLIB) $(SALHELPERLIB) $(FWELIB) $(BASICLIB) \ - $(XMLSCRIPTLIB) $(SJLIB) $(ICUDATALIB) $(ICULELIB) $(JVMACCESSLIB) \ - $(AVMEDIALIB) $(XMLOFFLIB) $(SAXLIB) $(FWILIB) $(DRAWINGLAYERLIB) $(LNGLIB) \ - $(CPPCANVASLIB) $(CANVASTOOLSLIB) $(AGGLIB) \ $(SVXLIB) #.IF "$(COM)"=="GCC" diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 1581e2decf..f419f08aad 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -99,8 +99,8 @@ long HundMMToTwips( long nIn ) ULONG SdrTableRtfExporter::Write() { - mrStrm << '{' << sRTF_RTF; - mrStrm << sRTF_ANSI << RTFOutFuncs::sNewLine; + mrStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF; + mrStrm << OOO_STRING_SVTOOLS_RTF_ANSI << RTFOutFuncs::sNewLine; Reference< XTableColumns > xColumns( mxTable->getColumns() ); const sal_Int32 nColCount = xColumns->getCount(); @@ -148,8 +148,8 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa sal_Int32 nRowHeight = 0; xRowSet->getPropertyValue( msSize ) >>= nRowHeight; - mrStrm << sRTF_TROWD << sRTF_TRGAPH << "30" << sRTF_TRLEFT << "-30"; - mrStrm << sRTF_TRRH << ByteString::CreateFromInt32( nRowHeight ).GetBuffer(); + mrStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30"; + mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << ByteString::CreateFromInt32( nRowHeight ).GetBuffer(); const sal_Int32 nColCount = mxTable->getColumnCount(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) @@ -167,25 +167,25 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa const sal_Char* pChar; if( !bIsMerged && ((nRowSpan > 1) || (nColSpan > 1)) ) - mrStrm << sRTF_CLMGF; // The first cell in a range of table cells to be merged. + mrStrm << OOO_STRING_SVTOOLS_RTF_CLMGF; // The first cell in a range of table cells to be merged. SdrTextVertAdjust eVAdj = xCell->GetTextVerticalAdjust(); switch( eVAdj ) { - case SVX_VER_JUSTIFY_TOP: pChar = sRTF_CLVERTALT; break; - case SVX_VER_JUSTIFY_CENTER: pChar = sRTF_CLVERTALC; break; - case SVX_VER_JUSTIFY_BOTTOM: pChar = sRTF_CLVERTALB; break; - case SVX_VER_JUSTIFY_STANDARD: pChar = sRTF_CLVERTALB; break; //! Bottom + case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALT; break; + case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALC; break; + case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; + case SVX_VER_JUSTIFY_STANDARD: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; //! Bottom default: pChar = NULL; break; } if ( pChar ) mrStrm << pChar; */ - mrStrm << sRTF_CELLX << ByteString::CreateFromInt32( aColumnStart[nCol] ).GetBuffer(); + mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << ByteString::CreateFromInt32( aColumnStart[nCol] ).GetBuffer(); if ( (nCol & 0x0F) == 0x0F ) mrStrm << RTFOutFuncs::sNewLine; // Zeilen nicht zu lang werden lassen } - mrStrm << sRTF_PARD << sRTF_PLAIN << sRTF_INTBL << RTFOutFuncs::sNewLine; + mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << RTFOutFuncs::sNewLine; ULONG nStrmPos = mrStrm.Tell(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) @@ -197,7 +197,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa nStrmPos = mrStrm.Tell(); } } - mrStrm << sRTF_ROW << RTFOutFuncs::sNewLine; + mrStrm << OOO_STRING_SVTOOLS_RTF_ROW << RTFOutFuncs::sNewLine; } @@ -207,7 +207,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) if( !xCell.is() || xCell->isMerged() ) { - mrStrm << sRTF_CELL; + mrStrm << OOO_STRING_SVTOOLS_RTF_CELL; return ; } @@ -244,38 +244,38 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) switch( eHAdj ) { - case SDRTEXTHORZADJUST_CENTER: pChar = sRTF_QC; break; - case SDRTEXTHORZADJUST_BLOCK: pChar = sRTF_QJ; break; - case SDRTEXTHORZADJUST_RIGHT: pChar = sRTF_QR; break; + case SDRTEXTHORZADJUST_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_QC; break; + case SDRTEXTHORZADJUST_BLOCK: pChar = OOO_STRING_SVTOOLS_RTF_QJ; break; + case SDRTEXTHORZADJUST_RIGHT: pChar = OOO_STRING_SVTOOLS_RTF_QR; break; case SDRTEXTHORZADJUST_LEFT: - default: pChar = sRTF_QL; break; + default: pChar = OOO_STRING_SVTOOLS_RTF_QL; break; } mrStrm << pChar; if ( rWeightItem.GetWeight() >= WEIGHT_BOLD ) { // bold bResetAttr = true; - mrStrm << sRTF_B; + mrStrm << OOO_STRING_SVTOOLS_RTF_B; } if ( rPostureItem.GetPosture() != ITALIC_NONE ) { // italic bResetAttr = true; - mrStrm << sRTF_I; + mrStrm << OOO_STRING_SVTOOLS_RTF_I; } if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE ) { // underline bResetAttr = true; - mrStrm << sRTF_UL; + mrStrm << OOO_STRING_SVTOOLS_RTF_UL; } mrStrm << ' '; RTFOutFuncs::Out_String( mrStrm, aContent ); - mrStrm << sRTF_CELL; + mrStrm << OOO_STRING_SVTOOLS_RTF_CELL; if ( bResetPar ) - mrStrm << sRTF_PARD << sRTF_INTBL; + mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; if ( bResetAttr ) - mrStrm << sRTF_PLAIN; + mrStrm << OOO_STRING_SVTOOLS_RTF_PLAIN; } } } diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 1071390435..6c12d64568 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -169,7 +169,6 @@ SHL2STDLIBS= \ $(TKLIB) \ $(VCLLIB) \ $(SVLLIB) \ - $(SOTLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ @@ -179,8 +178,7 @@ SHL2STDLIBS= \ $(CPPULIB) \ $(VOSLIB) \ $(SALLIB) \ - $(JVMFWKLIB) \ - $(ICUUCLIB) + $(JVMFWKLIB) .IF "$(debug)$(dbgutil)"!="" SHL2STDLIBS += $(CPPUHELPERLIB) diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index c20def42a3..a6c3f0aa8e 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -815,8 +815,7 @@ sal_Bool SAL_CALL CachedContentResultSet return nRow == m_nLastAppliedPos; } - else - return sal_True; + return sal_True; }; //-------------------------------------------------------------------------- diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk index 56019f2676..8334f233a0 100644 --- a/xmlhelp/source/treeview/makefile.mk +++ b/xmlhelp/source/treeview/makefile.mk @@ -62,8 +62,6 @@ SHL1STDLIBS=\ $(COMPHELPERLIB) \ $(EXPATASCII3RDLIB) \ $(SALLIB) \ - $(VOSLIB) \ - $(UCBHELPERLIB) \ $(UNOTOOLSLIB) SHL1VERSIONMAP= $(TARGET).map diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk index fe7c261298..acd80bb1f3 100644 --- a/xmloff/source/transform/makefile.mk +++ b/xmloff/source/transform/makefile.mk @@ -84,8 +84,7 @@ SHL1STDLIBS = \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALHELPERLIB) \ - $(SALLIB) \ - $(TOOLSLIB) + $(SALLIB) .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL1STDLIBS += -lxo$(DLLPOSTFIX) .ELSE diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk index 74c8572e26..d9ef85c217 100644 --- a/xmloff/util/makefile.mk +++ b/xmloff/util/makefile.mk @@ -83,8 +83,7 @@ SHL1STDLIBS= \ $(SVLLIB) \ $(SALLIB) \ $(UNOTOOLSLIB) \ - $(BASEGFXLIB) \ - $(SALHELPERLIB) + $(BASEGFXLIB) # SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols .IF "(OS)"=="SCO" diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk index 6bf682792c..ae1479cd5b 100644 --- a/xmlscript/util/makefile.mk +++ b/xmlscript/util/makefile.mk @@ -59,7 +59,6 @@ SHL1LIBS= \ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ $(CPPULIB) \ $(SALLIB) |