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>

10 files changed, 126 insertions, 142 deletions

diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk
index 38eaec110f74..d2d399d22cff 100644
--- a/chart2/source/controller/makefile.mk
+++ b/chart2/source/controller/makefile.mk
@@ -93,7 +93,6 @@ SHL1STDLIBS=	$(CHARTTOOLS)		\
                 $(SVXLIB)			\
                 $(TKLIB)			\
                 $(TOOLSLIB) 		\
-                $(I18NISOLANGLIB)   \
                 $(VCLLIB)           \
                 $(SFXLIB)			\
                 $(UNOTOOLSLIB)		\
diff --git a/chart2/source/model/makefile.mk b/chart2/source/model/makefile.mk
index 4d70f1048d68..8fb1e9dc3bed 100644
--- a/chart2/source/model/makefile.mk
+++ b/chart2/source/model/makefile.mk
@@ -75,7 +75,6 @@ SHL1LIBS= 		$(LIB1TARGET)
 #Links import libraries.
 
 SHL1STDLIBS=	$(CHARTTOOLS) 		\
-                $(BASEGFXLIB) 		\
                 $(CPPULIB)			\
                 $(CPPUHELPERLIB)	\
                 $(COMPHELPERLIB)	\
@@ -84,7 +83,6 @@ SHL1STDLIBS=	$(CHARTTOOLS) 		\
                 $(SVLLIB)			\
                 $(SVTOOLLIB)		\
                 $(GOODIESLIB)		\
-                $(SOTLIB)			\
                 $(SALLIB)			\
                 $(UCBHELPERLIB)
 
diff --git a/chart2/source/view/makefile.mk b/chart2/source/view/makefile.mk
index 4f74241075fe..58229edf1217 100644
--- a/chart2/source/view/makefile.mk
+++ b/chart2/source/view/makefile.mk
@@ -79,15 +79,12 @@ SHL1STDLIBS=	$(CHARTTOOLS)		\
                 $(CPPULIB)			\
                 $(CPPUHELPERLIB)	\
                 $(COMPHELPERLIB)	\
-                $(GOODIESLIB)		\
                 $(SALLIB)			\
                 $(SVLLIB)			\
                 $(SVTOOLLIB)		\
                 $(SVXLIB)			\
-                $(TKLIB)			\
                 $(TOOLSLIB) 		\
                 $(UNOTOOLSLIB)      \
-                $(I18NISOLANGLIB)   \
                 $(BASEGFXLIB) 		\
                 $(VCLLIB)           \
                 $(SFXLIB)			\
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index d6a847e62d41..69770c5ac6b1 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -141,7 +141,7 @@ const sal_Char __FAR_DATA ScHTMLExport::sIndentSource[nIndentMax+1] =
 #define lcl_OUT_LF()        rStrm << ScExportBase::sNewLine
 #define TAG_ON_LF( tag )    (TAG_ON( tag ) << ScExportBase::sNewLine << GetIndentStr())
 #define TAG_OFF_LF( tag )   (TAG_OFF( tag ) << ScExportBase::sNewLine << GetIndentStr())
-#define OUT_HR()            TAG_ON_LF( sHTML_horzrule )
+#define OUT_HR()            TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule )
 #define OUT_COMMENT( comment )  (rStrm << sMyBegComment, OUT_STR( comment ) \
                                 << sMyEndComment << ScExportBase::sNewLine \
                                 << GetIndentStr())
@@ -376,14 +376,14 @@ Size ScHTMLExport::MMToPixel( const Size& rSize )
 
 ULONG ScHTMLExport::Write()
 {
-    rStrm << '<' << sHTML_doctype << ' ' << sHTML_doctype32 << '>'
+    rStrm << '<' << OOO_STRING_SVTOOLS_HTML_doctype << ' ' << OOO_STRING_SVTOOLS_HTML_doctype32 << '>'
         << sNewLine << sNewLine;
-    TAG_ON_LF( sHTML_html );
+    TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html );
     WriteHeader();
     OUT_LF();
     WriteBody();
     OUT_LF();
-    TAG_OFF_LF( sHTML_html );
+    TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_html );
 
     return rStrm.GetError();
 }
@@ -391,7 +391,7 @@ ULONG ScHTMLExport::Write()
 
 void ScHTMLExport::WriteHeader()
 {
-    IncIndent(1); TAG_ON_LF( sHTML_head );
+    IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_head );
 
     if ( pDoc->IsClipOrUndo() )
     {   // no real DocInfo available, but some META information like charset needed
@@ -426,12 +426,12 @@ void ScHTMLExport::WriteHeader()
 
     // CSS1 StyleSheet
     PageDefaults( bAll ? 0 : aRange.aStart.Tab() );
-    IncIndent(1); TAG_ON_LF( sHTML_style );
+    IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_style );
     rStrm << sMyBegComment; OUT_LF();
-    rStrm << sHTML_body << "," << sHTML_division << "," << sHTML_table << ","
-        << sHTML_thead << "," << sHTML_tbody << "," << sHTML_tfoot << ","
-        << sHTML_tablerow << "," << sHTML_tableheader << ","
-        << sHTML_tabledata << "," << sHTML_parabreak << " { " << sFontFamily;
+    rStrm << OOO_STRING_SVTOOLS_HTML_body << "," << OOO_STRING_SVTOOLS_HTML_division << "," << OOO_STRING_SVTOOLS_HTML_table << ","
+        << OOO_STRING_SVTOOLS_HTML_thead << "," << OOO_STRING_SVTOOLS_HTML_tbody << "," << OOO_STRING_SVTOOLS_HTML_tfoot << ","
+        << OOO_STRING_SVTOOLS_HTML_tablerow << "," << OOO_STRING_SVTOOLS_HTML_tableheader << ","
+        << OOO_STRING_SVTOOLS_HTML_tabledata << "," << OOO_STRING_SVTOOLS_HTML_parabreak << " { " << sFontFamily;
     xub_StrLen nFonts = aHTMLStyle.aFontFamilyName.GetTokenCount( ';' );
     if ( nFonts == 1 )
     {
@@ -456,9 +456,9 @@ void ScHTMLExport::WriteHeader()
         << GetFontSizeCss( ( USHORT ) aHTMLStyle.nFontHeight ) << " }";
     OUT_LF();
     rStrm << sMyEndComment;
-    IncIndent(-1); OUT_LF(); TAG_OFF_LF( sHTML_style );
+    IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_style );
 
-    IncIndent(-1); OUT_LF(); TAG_OFF_LF( sHTML_head );
+    IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head );
 }
 
 
@@ -468,10 +468,10 @@ void ScHTMLExport::WriteOverview()
     {
         IncIndent(1);
         OUT_HR();
-        IncIndent(1); TAG_ON( sHTML_parabreak ); TAG_ON_LF( sHTML_center );
-        TAG_ON( sHTML_head1 );
+        IncIndent(1); TAG_ON( OOO_STRING_SVTOOLS_HTML_parabreak ); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_center );
+        TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 );
         OUT_STR( ScGlobal::GetRscString( STR_OVERVIEW ) );
-        TAG_OFF_LF( sHTML_head1 );
+        TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head1 );
 
         String       aStr;
 
@@ -486,12 +486,12 @@ void ScHTMLExport::WriteOverview()
                     << "\">";
                 OUT_STR( aStr );
                 rStrm << "</A>";
-                TAG_ON_LF( sHTML_linebreak );
+                TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_linebreak );
             }
         }
 
         IncIndent(-1); OUT_LF();
-        IncIndent(-1); TAG_OFF( sHTML_center ); TAG_OFF_LF( sHTML_parabreak );
+        IncIndent(-1); TAG_OFF( OOO_STRING_SVTOOLS_HTML_center ); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_parabreak );
     }
 }
 
@@ -577,7 +577,7 @@ void ScHTMLExport::WriteBody()
     const SvxBrushItem* pBrushItem = (const SvxBrushItem*)&rSet.Get( ATTR_BACKGROUND );
 
     // default Textfarbe schwarz
-    rStrm << '<' << sHTML_body << ' ' << sHTML_O_text << "=\"#000000\"";
+    rStrm << '<' << OOO_STRING_SVTOOLS_HTML_body << ' ' << OOO_STRING_SVTOOLS_HTML_O_text << "=\"#000000\"";
 
     if ( bAll && GPOS_NONE != pBrushItem->GetGraphicPos() )
     {
@@ -622,7 +622,7 @@ void ScHTMLExport::WriteBody()
         }
         if( pLink )
         {
-            rStrm << ' ' << sHTML_O_background << "=\"";
+            rStrm << ' ' << OOO_STRING_SVTOOLS_HTML_O_background << "=\"";
             OUT_STR( URIHelper::simpleNormalizedMakeRelative(
                         aBaseURL,
                         *pLink ) ) << '\"';
@@ -633,7 +633,7 @@ void ScHTMLExport::WriteBody()
         // background of the browser. Also, HTMLOutFuncs::Out_Color() writes
         // black #000000 for COL_AUTO which is the same as white #ffffff with
         // transparency set to 0xff, our default background.
-        OUT_SP_CSTR_ASS( sHTML_O_bgcolor );
+        OUT_SP_CSTR_ASS( OOO_STRING_SVTOOLS_HTML_O_bgcolor );
         HTMLOutFuncs::Out_Color( rStrm, aHTMLStyle.aBackgroundColor );
     }
 
@@ -644,7 +644,7 @@ void ScHTMLExport::WriteBody()
 
     WriteTables();
 
-    TAG_OFF_LF( sHTML_body );
+    TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_body );
 }
 
 
@@ -703,15 +703,15 @@ void ScHTMLExport::WriteTables()
                 rStrm << "<A NAME=\"table"
                     << ByteString::CreateFromInt32( nTab ).GetBuffer()
                     << "\">";
-                TAG_ON( sHTML_head1 );
+                TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 );
                 OUT_STR( aStrOut );
-                TAG_ON( sHTML_emphasis );
+                TAG_ON( OOO_STRING_SVTOOLS_HTML_emphasis );
 
                 pDoc->GetName( nTab, aStr );
                 OUT_STR( aStr );
 
-                TAG_OFF( sHTML_emphasis );
-                TAG_OFF( sHTML_head1 );
+                TAG_OFF( OOO_STRING_SVTOOLS_HTML_emphasis );
+                TAG_OFF( OOO_STRING_SVTOOLS_HTML_head1 );
                 rStrm << "</A>"; OUT_LF();
             }
         }
@@ -726,11 +726,11 @@ void ScHTMLExport::WriteTables()
         }
 
         // <TABLE ...>
-        ByteString  aByteStrOut = sHTML_table;
-//      aStrOut  = sHTML_table;
+        ByteString  aByteStrOut = OOO_STRING_SVTOOLS_HTML_table;
+//      aStrOut  = OOO_STRING_SVTOOLS_HTML_table;
 
         // FRAME=VOID, we do the styling of the cells in <TD>
-        (((aByteStrOut += ' ') += sHTML_frame) += '=') += sHTML_TF_void;
+        (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_frame) += '=') += OOO_STRING_SVTOOLS_HTML_TF_void;
 
         bTabHasGraphics = bTabAlignedLeft = FALSE;
         if ( bAll && pDrawLayer )
@@ -739,10 +739,10 @@ void ScHTMLExport::WriteTables()
 
         // more <TABLE ...>
         if ( bTabAlignedLeft )
-            (((aByteStrOut += ' ') += sHTML_O_align) += '=') += sHTML_AL_left;
+            (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += OOO_STRING_SVTOOLS_HTML_AL_left;
             // ALIGN=LEFT allow text and graphics to flow around
         // CELLSPACING
-        (((aByteStrOut += ' ' ) += sHTML_O_cellspacing ) += '=') +=
+        (((aByteStrOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_cellspacing ) += '=') +=
                                     ByteString::CreateFromInt32( nCellSpacing );
         // COLS=n
         SCCOL nColCnt = 0;
@@ -752,21 +752,21 @@ void ScHTMLExport::WriteTables()
             if ( !(pDoc->GetColFlags( nCol, nTab ) & CR_HIDDEN) )
                 ++nColCnt;
         }
-        (((aByteStrOut += ' ') += sHTML_O_cols) += '=') += ByteString::CreateFromInt32( nColCnt );
+        (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += '=') += ByteString::CreateFromInt32( nColCnt );
 
         // RULES=NONE, we do the styling of the cells in <TD>
-        (((aByteStrOut += ' ') += sHTML_O_rules) += '=') += sHTML_TR_none;
+        (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_rules) += '=') += OOO_STRING_SVTOOLS_HTML_TR_none;
 
         // BORDER=0, we do the styling of the cells in <TD>
-        ((aByteStrOut += ' ') += sHTML_O_border) += "=0";
+        ((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_border) += "=0";
         IncIndent(1); TAG_ON_LF( aByteStrOut.GetBuffer() );
 
         // <COLGROUP>
-        TAG_ON( sHTML_colgroup );
+        TAG_ON( OOO_STRING_SVTOOLS_HTML_colgroup );
         // <COL WIDTH=x> as pre-info for long tables
-        ByteString  aByteStr = sHTML_col;
+        ByteString  aByteStr = OOO_STRING_SVTOOLS_HTML_col;
         aByteStr += ' ';
-        aByteStr += sHTML_O_width;
+        aByteStr += OOO_STRING_SVTOOLS_HTML_O_width;
         aByteStr += '=';
         for ( nCol=nStartCol; nCol<=nEndCol; nCol++ )
         {
@@ -778,10 +778,10 @@ void ScHTMLExport::WriteTables()
                                 ToPixel( pDoc->GetColWidth( nCol, nTab ) ) );
             TAG_ON( aByteStrOut.GetBuffer() );
         }
-        TAG_OFF_LF( sHTML_colgroup );
+        TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_colgroup );
 
         // <TBODY>
-        IncIndent(1); TAG_ON_LF( sHTML_tbody );
+        IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tbody );
         // At least old (3.x, 4.x?) Netscape doesn't follow <TABLE COLS=n> and
         // <COL WIDTH=x> specified, but needs a width at every column.
         bTableDataWidth = TRUE;     // widths in first row
@@ -797,7 +797,7 @@ void ScHTMLExport::WriteTables()
                 continue;   // for
             }
 
-            IncIndent(1); TAG_ON_LF( sHTML_tablerow );
+            IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tablerow );
             bTableDataHeight = TRUE;  // height at every first cell of each row
             for ( SCCOL nCol2=nStartCol; nCol2<=nEndCol; nCol2++ )
             {
@@ -813,11 +813,11 @@ void ScHTMLExport::WriteTables()
 
             if ( nRow == nEndRow )
                 IncIndent(-1);
-            TAG_OFF_LF( sHTML_tablerow );
+            TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tablerow );
         }
-        IncIndent(-1); TAG_OFF_LF( sHTML_tbody );
+        IncIndent(-1); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tbody );
 
-        IncIndent(-1); TAG_OFF_LF( sHTML_table );
+        IncIndent(-1); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_table );
 
         if ( bTabHasGraphics )
         {
@@ -831,8 +831,8 @@ void ScHTMLExport::WriteTables()
             aGraphList.Clear();
             if ( bTabAlignedLeft )
             {   // clear <TABLE ALIGN=LEFT> with <BR CLEAR=LEFT>
-                aByteStrOut = sHTML_linebreak;
-                (((aByteStrOut += ' ') += sHTML_O_clear) += '=') += sHTML_AL_left;
+                aByteStrOut = OOO_STRING_SVTOOLS_HTML_linebreak;
+                (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_clear) += '=') += OOO_STRING_SVTOOLS_HTML_AL_left;
                 TAG_ON_LF( aByteStrOut.GetBuffer() );
             }
         }
@@ -887,13 +887,13 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
         nScriptType = aHTMLStyle.nDefaultScriptType;
 
 
-    ByteString aStrTD = sHTML_tabledata;
+    ByteString aStrTD = OOO_STRING_SVTOOLS_HTML_tabledata;
 
     // border of the cells
     SvxBoxItem* pBorder = (SvxBoxItem*) pDoc->GetAttr( nCol, nRow, nTab, ATTR_BORDER );
     if ( pBorder && (pBorder->GetTop() || pBorder->GetBottom() || pBorder->GetLeft() || pBorder->GetRight()) )
     {
-        ((aStrTD += ' ') += sHTML_style) += "=\"";
+        ((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_style) += "=\"";
 
         bool bInsertSemicolon = false;
         BorderToStyle( aStrTD, "top", pBorder->GetTop(), bInsertSemicolon );
@@ -921,7 +921,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
             nC = rMergeAttr.GetColMerge();
         if ( nC > 1 )
         {
-            (((aStrTD += ' ') += sHTML_O_colspan) += '=') += ByteString::CreateFromInt32( nC );
+            (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_colspan) += '=') += ByteString::CreateFromInt32( nC );
             nC = nC + nCol;
             for ( jC=nCol, v=0; jC<nC; jC++ )
                 v += pDoc->GetColWidth( jC, nTab );
@@ -937,7 +937,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
             nR = rMergeAttr.GetRowMerge();
         if ( nR > 1 )
         {
-            (((aStrTD += ' ') += sHTML_O_rowspan) += '=') += ByteString::CreateFromInt32( nR );
+            (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_rowspan) += '=') += ByteString::CreateFromInt32( nR );
             nR += nRow;
             v = pDoc->GetRowHeight( nRow, nR-1, nTab );
             nHeightPixel = ToPixel( static_cast< USHORT >( v ) );
@@ -952,9 +952,9 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     }
 
     if ( bTableDataWidth )
-        (((aStrTD += ' ') += sHTML_O_width) += '=') += ByteString::CreateFromInt32( nWidthPixel );
+        (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += '=') += ByteString::CreateFromInt32( nWidthPixel );
     if ( bTableDataHeight )
-        (((aStrTD += ' ') += sHTML_O_height) += '=') += ByteString::CreateFromInt32( nHeightPixel );
+        (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += '=') += ByteString::CreateFromInt32( nHeightPixel );
 
     const SvxFontItem& rFontItem = (const SvxFontItem&) pAttr->GetItem(
             ScGlobal::GetScriptedWhichID( nScriptType, ATTR_FONT),
@@ -1021,32 +1021,32 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     switch( rHorJustifyItem.GetValue() )
     {
         case SVX_HOR_JUSTIFY_STANDARD:
-            pChar = (bValueData ? sHTML_AL_right : sHTML_AL_left);
+            pChar = (bValueData ? OOO_STRING_SVTOOLS_HTML_AL_right : OOO_STRING_SVTOOLS_HTML_AL_left);
             break;
-        case SVX_HOR_JUSTIFY_CENTER:    pChar = sHTML_AL_center;    break;
-        case SVX_HOR_JUSTIFY_BLOCK:     pChar = sHTML_AL_justify;   break;
-        case SVX_HOR_JUSTIFY_RIGHT:     pChar = sHTML_AL_right;     break;
+        case SVX_HOR_JUSTIFY_CENTER:    pChar = OOO_STRING_SVTOOLS_HTML_AL_center;  break;
+        case SVX_HOR_JUSTIFY_BLOCK:     pChar = OOO_STRING_SVTOOLS_HTML_AL_justify; break;
+        case SVX_HOR_JUSTIFY_RIGHT:     pChar = OOO_STRING_SVTOOLS_HTML_AL_right;       break;
         case SVX_HOR_JUSTIFY_LEFT:
         case SVX_HOR_JUSTIFY_REPEAT:
-        default:                        pChar = sHTML_AL_left;      break;
+        default:                        pChar = OOO_STRING_SVTOOLS_HTML_AL_left;        break;
     }
 
-    (((aStrTD += ' ') += sHTML_O_align) += '=') += pChar;
+    (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += pChar;
 
     switch( rVerJustifyItem.GetValue() )
     {
-        case SVX_VER_JUSTIFY_TOP:       pChar = sHTML_VA_top;       break;
-        case SVX_VER_JUSTIFY_CENTER:    pChar = sHTML_VA_middle;    break;
-        case SVX_VER_JUSTIFY_BOTTOM:    pChar = sHTML_VA_bottom;    break;
+        case SVX_VER_JUSTIFY_TOP:       pChar = OOO_STRING_SVTOOLS_HTML_VA_top;     break;
+        case SVX_VER_JUSTIFY_CENTER:    pChar = OOO_STRING_SVTOOLS_HTML_VA_middle;  break;
+        case SVX_VER_JUSTIFY_BOTTOM:    pChar = OOO_STRING_SVTOOLS_HTML_VA_bottom;  break;
         case SVX_VER_JUSTIFY_STANDARD:
         default:                        pChar = NULL;
     }
     if ( pChar )
-        (((aStrTD += ' ') += sHTML_O_valign) += '=') += pChar;
+        (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_valign) += '=') += pChar;
 
     if ( aHTMLStyle.aBackgroundColor != aBgColor )
     {
-        ((aStrTD += ' ') += sHTML_O_bgcolor) += '=';
+        ((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_bgcolor) += '=';
         lcl_AppendHTMLColorTripel( aStrTD, aBgColor );
     }
 
@@ -1078,17 +1078,17 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
 
     TAG_ON( aStrTD.GetBuffer() );
 
-    if ( bBold )        TAG_ON( sHTML_bold );
-    if ( bItalic )      TAG_ON( sHTML_italic );
-    if ( bUnderline )   TAG_ON( sHTML_underline );
+    if ( bBold )        TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
+    if ( bItalic )      TAG_ON( OOO_STRING_SVTOOLS_HTML_italic );
+    if ( bUnderline )   TAG_ON( OOO_STRING_SVTOOLS_HTML_underline );
 
 
     if ( bSetFont )
     {
-        ByteString  aStr = sHTML_font;
+        ByteString  aStr = OOO_STRING_SVTOOLS_HTML_font;
         if ( bSetFontName )
         {
-            ((aStr += ' ') += sHTML_O_face) += "=\"";
+            ((aStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_face) += "=\"";
             xub_StrLen nFonts = rFontItem.GetFamilyName().GetTokenCount( ';' );
             if ( nFonts == 1 )
             {
@@ -1115,7 +1115,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
         }
         if ( nSetFontSizeNumber )
         {
-            (((aStr += ' ') += sHTML_O_size) += '=')
+            (((aStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_size) += '=')
                 += ByteString::CreateFromInt32( nSetFontSizeNumber );
         }
         if ( bSetFontColor )
@@ -1126,7 +1126,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
             if ( aColor.GetColor() == COL_AUTO )
                 aColor.SetColor( COL_BLACK );
 
-            ((aStr += ' ') += sHTML_O_color) += '=';
+            ((aStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_color) += '=';
             lcl_AppendHTMLColorTripel( aStr, aColor );
         }
         TAG_ON( aStr.GetBuffer() );
@@ -1154,19 +1154,19 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
     if ( !bFieldText )
     {
         if ( !aStrOut.Len() )
-            TAG_ON( sHTML_linebreak );      // #42573# keine komplett leere Zelle
+            TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak );        // #42573# keine komplett leere Zelle
         else
             OUT_STR( aStrOut );
     }
     if ( pGraphEntry )
         WriteGraphEntry( pGraphEntry );
 
-    if ( bSetFont )     TAG_OFF( sHTML_font );
-    if ( bUnderline )   TAG_OFF( sHTML_underline );
-    if ( bItalic )      TAG_OFF( sHTML_italic );
-    if ( bBold )        TAG_OFF( sHTML_bold );
+    if ( bSetFont )     TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
+    if ( bUnderline )   TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline );
+    if ( bItalic )      TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic );
+    if ( bBold )        TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
 
-    TAG_OFF_LF( sHTML_tabledata );
+    TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tabledata );
 }
 
 
@@ -1217,11 +1217,11 @@ BOOL ScHTMLExport::WriteFieldText( const ScEditCell* pCell )
                             bUrl = TRUE;
                             const SvxURLField*  pURLField = (const SvxURLField*)pField;
 //                          String              aFieldText = rEngine.GetText( aSel );
-                            rStrm << '<' << sHTML_anchor << ' ' << sHTML_O_href << "=\"";
+                            rStrm << '<' << OOO_STRING_SVTOOLS_HTML_anchor << ' ' << OOO_STRING_SVTOOLS_HTML_O_href << "=\"";
                             OUT_STR( pURLField->GetURL() );
                             rStrm << "\">";
                             OUT_STR( pURLField->GetRepresentation() );
-                            rStrm << "</" << sHTML_anchor << '>';
+                            rStrm << "</" << OOO_STRING_SVTOOLS_HTML_anchor << '>';
                         }
                     }
                 }
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index e32da2fe9227..b9705e66936d 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -141,15 +141,15 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
 {
     SdrObject* pObject = pE->pObject;
     ByteString aOpt;
-    (((aOpt += ' ') += sHTML_O_width) += '=') +=
+    (((aOpt += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += '=') +=
         ByteString::CreateFromInt32( pE->aSize.Width() );
-    (((aOpt += ' ') += sHTML_O_height) += '=') +=
+    (((aOpt += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += '=') +=
         ByteString::CreateFromInt32( pE->aSize.Height() );
     if ( pE->bInCell )
     {
-        (((aOpt += ' ') += sHTML_O_hspace) += '=') +=
+        (((aOpt += ' ') += OOO_STRING_SVTOOLS_HTML_O_hspace) += '=') +=
             ByteString::CreateFromInt32( pE->aSpace.Width() );
-        (((aOpt += ' ') += sHTML_O_vspace) += '=') +=
+        (((aOpt += ' ') += OOO_STRING_SVTOOLS_HTML_O_vspace) += '=') +=
             ByteString::CreateFromInt32( pE->aSpace.Height() );
     }
     switch ( pObject->GetObjIdentifier() )
@@ -237,7 +237,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf,
     }
     if( rLinkName.Len() )
     {   // <IMG SRC="..."[ rImgOptions]>
-        rStrm << '<' << sHTML_image << ' ' << sHTML_O_src << "=\"";
+        rStrm << '<' << OOO_STRING_SVTOOLS_HTML_image << ' ' << OOO_STRING_SVTOOLS_HTML_O_src << "=\"";
         HTMLOutFuncs::Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(
                     aBaseURL,
                     rLinkName ), eDestEnc ) << '\"';
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 38bd3e2dde65..7fed8e84942a 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -173,7 +173,7 @@ ULONG ScHTMLLayoutParser::Read( SvStream& rStream, const String& rBaseURL )
             aContentType.AppendAscii( pCharSet );
 
             xValues = new SvKeyValueIterator;
-            xValues->Append( SvKeyValue( String::CreateFromAscii( sHTML_META_content_type ), aContentType ) );
+            xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) );
             pAttributes = xValues;
         }
     }
@@ -958,11 +958,11 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo )
                 bHorJustifyCenterTH = FALSE;
                 SvxCellHorJustify eVal;
                 const String& rOptVal = pOption->GetString();
-                if ( rOptVal.CompareIgnoreCaseToAscii( sHTML_AL_right ) == COMPARE_EQUAL )
+                if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL )
                     eVal = SVX_HOR_JUSTIFY_RIGHT;
-                else if ( rOptVal.CompareIgnoreCaseToAscii( sHTML_AL_center ) == COMPARE_EQUAL )
+                else if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) == COMPARE_EQUAL )
                     eVal = SVX_HOR_JUSTIFY_CENTER;
-                else if ( rOptVal.CompareIgnoreCaseToAscii( sHTML_AL_left ) == COMPARE_EQUAL )
+                else if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_left ) == COMPARE_EQUAL )
                     eVal = SVX_HOR_JUSTIFY_LEFT;
                 else
                     eVal = SVX_HOR_JUSTIFY_STANDARD;
@@ -974,11 +974,11 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo )
             {
                 SvxCellVerJustify eVal;
                 const String& rOptVal = pOption->GetString();
-                if ( rOptVal.CompareIgnoreCaseToAscii( sHTML_VA_top ) == COMPARE_EQUAL )
+                if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_VA_top ) == COMPARE_EQUAL )
                     eVal = SVX_VER_JUSTIFY_TOP;
-                else if ( rOptVal.CompareIgnoreCaseToAscii( sHTML_VA_middle ) == COMPARE_EQUAL )
+                else if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_VA_middle ) == COMPARE_EQUAL )
                     eVal = SVX_VER_JUSTIFY_CENTER;
-                else if ( rOptVal.CompareIgnoreCaseToAscii( sHTML_VA_bottom ) == COMPARE_EQUAL )
+                else if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_VA_bottom ) == COMPARE_EQUAL )
                     eVal = SVX_VER_JUSTIFY_BOTTOM;
                 else
                     eVal = SVX_VER_JUSTIFY_STANDARD;
@@ -2520,11 +2520,11 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo&
             {
                 SvxCellHorJustify eVal = SVX_HOR_JUSTIFY_STANDARD;
                 const String& rOptVal = aIter->GetString();
-                if( rOptVal.EqualsIgnoreCaseAscii( sHTML_AL_right ) )
+                if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) )
                     eVal = SVX_HOR_JUSTIFY_RIGHT;
-                else if( rOptVal.EqualsIgnoreCaseAscii( sHTML_AL_center ) )
+                else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) )
                     eVal = SVX_HOR_JUSTIFY_CENTER;
-                else if( rOptVal.EqualsIgnoreCaseAscii( sHTML_AL_left ) )
+                else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_left ) )
                     eVal = SVX_HOR_JUSTIFY_LEFT;
                 if( eVal != SVX_HOR_JUSTIFY_STANDARD )
                     rItemSet.Put( SvxHorJustifyItem( eVal, ATTR_HOR_JUSTIFY ) );
@@ -2535,11 +2535,11 @@ void ScHTMLTable::ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo&
             {
                 SvxCellVerJustify eVal = SVX_VER_JUSTIFY_STANDARD;
                 const String& rOptVal = aIter->GetString();
-                if( rOptVal.EqualsIgnoreCaseAscii( sHTML_VA_top ) )
+                if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_top ) )
                     eVal = SVX_VER_JUSTIFY_TOP;
-                else if( rOptVal.EqualsIgnoreCaseAscii( sHTML_VA_middle ) )
+                else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_middle ) )
                     eVal = SVX_VER_JUSTIFY_CENTER;
-                else if( rOptVal.EqualsIgnoreCaseAscii( sHTML_VA_bottom ) )
+                else if( rOptVal.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_VA_bottom ) )
                     eVal = SVX_VER_JUSTIFY_BOTTOM;
                 if( eVal != SVX_VER_JUSTIFY_STANDARD )
                     rItemSet.Put( SvxVerJustifyItem( eVal, ATTR_VER_JUSTIFY ) );
@@ -2807,7 +2807,7 @@ ULONG ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL  )
             aContentType.AppendAscii( pCharSet );
 
             xValues = new SvKeyValueIterator;
-            xValues->Append( SvKeyValue( String::CreateFromAscii( sHTML_META_content_type ), aContentType ) );
+            xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) );
             pAttributes = xValues;
         }
     }
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 3d4d50d46374..aee41be1a441 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -84,8 +84,8 @@ ScRTFExport::~ScRTFExport()
 
 ULONG ScRTFExport::Write()
 {
-    rStrm << '{' << sRTF_RTF;
-    rStrm << sRTF_ANSI << sNewLine;
+    rStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
+    rStrm << OOO_STRING_SVTOOLS_RTF_ANSI << sNewLine;
 
 #if 0
 // das ist noch nicht ausgegoren
@@ -101,9 +101,9 @@ ULONG ScRTFExport::Write()
     // fonttbl
     String aFontFamilyName(
         ((const SvxFontItem&)(rSetPara.Get( ATTR_FONT ))).GetFamilyName() );
-    rStrm << sRTF_DEFF << '0'
-        << '{' << sRTF_FONTTBL
-        << '{' << sRTF_F << '0' << sRTF_FNIL << ' ' << aFontFamilyName.GetStr() << ";}"
+    rStrm << OOO_STRING_SVTOOLS_RTF_DEFF << '0'
+        << '{' << OOO_STRING_SVTOOLS_RTF_FONTTBL
+        << '{' << OOO_STRING_SVTOOLS_RTF_F << '0' << OOO_STRING_SVTOOLS_RTF_FNIL << ' ' << aFontFamilyName.GetStr() << ";}"
         << '}' << sNewLine;
 
     // hier kaeme die colortbl
@@ -111,8 +111,8 @@ ULONG ScRTFExport::Write()
     // stylesheet
     UINT32 nFontHeight =
         ((const SvxFontHeightItem&)(rSetPara.Get( ATTR_FONT_HEIGHT ))).GetHeight();
-    rStrm << '{' << sRTF_STYLESHEET
-        << '{' << sRTF_FS << String( UINT32(nFontHeight / TWIPS_PER_POINT) ).GetStr()
+    rStrm << '{' << OOO_STRING_SVTOOLS_RTF_STYLESHEET
+        << '{' << OOO_STRING_SVTOOLS_RTF_FS << String( UINT32(nFontHeight / TWIPS_PER_POINT) ).GetStr()
             << ' ' << pStyleSheet->GetName().GetStr() << ";}"
         << '}' << sNewLine;
 */
@@ -122,7 +122,7 @@ ULONG ScRTFExport::Write()
     for ( SCTAB nTab = aRange.aStart.Tab(); nTab <= aRange.aEnd.Tab(); nTab++ )
     {
         if ( nTab > aRange.aStart.Tab() )
-            rStrm << sRTF_PAR;
+            rStrm << OOO_STRING_SVTOOLS_RTF_PAR;
         WriteTab( nTab );
     }
 
@@ -156,8 +156,8 @@ void ScRTFExport::WriteTab( SCTAB nTab )
 
 void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
 {
-    rStrm << sRTF_TROWD << sRTF_TRGAPH << "30" << sRTF_TRLEFT << "-30";
-    rStrm << sRTF_TRRH << ByteString::CreateFromInt32( pDoc->GetRowHeight( nRow, nTab ) ).GetBuffer();
+    rStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
+    rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << ByteString::CreateFromInt32( pDoc->GetRowHeight( nRow, nTab ) ).GetBuffer();
     SCCOL nCol;
     SCCOL nEndCol = aRange.aEnd.Col();
     for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -169,30 +169,30 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
         const sal_Char* pChar;
 
         if ( rMergeAttr.GetColMerge() != 0 )
-            rStrm << sRTF_CLMGF;
+            rStrm << OOO_STRING_SVTOOLS_RTF_CLMGF;
         else
         {
             const ScMergeFlagAttr& rMergeFlagAttr = (const ScMergeFlagAttr&) pAttr->GetItem( ATTR_MERGE_FLAG );
             if ( rMergeFlagAttr.IsHorOverlapped() )
-                rStrm << sRTF_CLMRG;
+                rStrm << OOO_STRING_SVTOOLS_RTF_CLMRG;
         }
 
         switch( rVerJustifyItem.GetValue() )
         {
-            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 )
             rStrm << pChar;
 
-        rStrm << sRTF_CELLX << ByteString::CreateFromInt32( pCellX[nCol+1] ).GetBuffer();
+        rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << ByteString::CreateFromInt32( pCellX[nCol+1] ).GetBuffer();
         if ( (nCol & 0x0F) == 0x0F )
             rStrm << sNewLine;      // Zeilen nicht zu lang werden lassen
     }
-    rStrm << sRTF_PARD << sRTF_PLAIN << sRTF_INTBL << sNewLine;
+    rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << sNewLine;
 
     ULONG nStrmPos = rStrm.Tell();
     for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -204,7 +204,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
             nStrmPos = rStrm.Tell();
         }
     }
-    rStrm << sRTF_ROW << sNewLine;
+    rStrm << OOO_STRING_SVTOOLS_RTF_ROW << sNewLine;
 }
 
 
@@ -215,7 +215,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
     const ScMergeFlagAttr& rMergeFlagAttr = (const ScMergeFlagAttr&) pAttr->GetItem( ATTR_MERGE_FLAG );
     if ( rMergeFlagAttr.IsHorOverlapped() )
     {
-        rStrm << sRTF_CELL;
+        rStrm << OOO_STRING_SVTOOLS_RTF_CELL;
         return ;
     }
 
@@ -268,41 +268,41 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
     switch( rHorJustifyItem.GetValue() )
     {
         case SVX_HOR_JUSTIFY_STANDARD:
-            pChar = (bValueData ? sRTF_QR : sRTF_QL);
+            pChar = (bValueData ? OOO_STRING_SVTOOLS_RTF_QR : OOO_STRING_SVTOOLS_RTF_QL);
             break;
-        case SVX_HOR_JUSTIFY_CENTER:    pChar = sRTF_QC;    break;
-        case SVX_HOR_JUSTIFY_BLOCK:     pChar = sRTF_QJ;    break;
-        case SVX_HOR_JUSTIFY_RIGHT:     pChar = sRTF_QR;    break;
+        case SVX_HOR_JUSTIFY_CENTER:    pChar = OOO_STRING_SVTOOLS_RTF_QC;  break;
+        case SVX_HOR_JUSTIFY_BLOCK:     pChar = OOO_STRING_SVTOOLS_RTF_QJ;  break;
+        case SVX_HOR_JUSTIFY_RIGHT:     pChar = OOO_STRING_SVTOOLS_RTF_QR;  break;
         case SVX_HOR_JUSTIFY_LEFT:
         case SVX_HOR_JUSTIFY_REPEAT:
-        default:                        pChar = sRTF_QL;    break;
+        default:                        pChar = OOO_STRING_SVTOOLS_RTF_QL;  break;
     }
     rStrm << pChar;
 
     if ( rWeightItem.GetWeight() >= WEIGHT_BOLD )
     {   // bold
         bResetAttr = TRUE;
-        rStrm << sRTF_B;
+        rStrm << OOO_STRING_SVTOOLS_RTF_B;
     }
     if ( rPostureItem.GetPosture() != ITALIC_NONE )
     {   // italic
         bResetAttr = TRUE;
-        rStrm << sRTF_I;
+        rStrm << OOO_STRING_SVTOOLS_RTF_I;
     }
     if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE )
     {   // underline
         bResetAttr = TRUE;
-        rStrm << sRTF_UL;
+        rStrm << OOO_STRING_SVTOOLS_RTF_UL;
     }
 
     rStrm << ' ';
     RTFOutFuncs::Out_String( rStrm, aContent );
-    rStrm << sRTF_CELL;
+    rStrm << OOO_STRING_SVTOOLS_RTF_CELL;
 
     if ( bResetPar )
-        rStrm << sRTF_PARD << sRTF_INTBL;
+        rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL;
     if ( bResetAttr )
-        rStrm << sRTF_PLAIN;
+        rStrm << OOO_STRING_SVTOOLS_RTF_PLAIN;
 }
 
 
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 8791941314f1..fe2bf6bc636d 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -188,23 +188,17 @@ SHL6STDLIBS= \
     $(SVTOOLLIB)	\
     $(SVLLIB)		\
     $(SVXLIB)		\
-    $(GOODIESLIB)	\
     $(BASEGFXLIB) \
     $(VCLLIB)		\
     $(CPPULIB)		\
     $(CPPUHELPERLIB)	\
     $(COMPHELPERLIB)	\
-    $(UCBHELPERLIB)	\
     $(TKLIB)		\
     $(VOSLIB)		\
     $(SALLIB)		\
     $(TOOLSLIB)	\
-    $(I18NISOLANGLIB) \
     $(UNOTOOLSLIB) \
     $(SOTLIB)		\
-    $(XMLOFFLIB)	\
-    $(DBTOOLSLIB)	\
-    $(AVMEDIALIB)   \
     $(OOXLIB)       \
     $(SAXLIB) \
     $(FORLIB)
diff --git a/scaddins/source/analysis/makefile.mk b/scaddins/source/analysis/makefile.mk
index 58c064e91a0f..e51d10825758 100644
--- a/scaddins/source/analysis/makefile.mk
+++ b/scaddins/source/analysis/makefile.mk
@@ -106,11 +106,9 @@ SRC1FILES =  \
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS= \
-        $(VCLLIB)			\
         $(TOOLSLIB)			\
         $(CPPUHELPERLIB)	\
         $(CPPULIB)			\
-        $(VOSLIB)			\
         $(SALLIB)
 
 SHL1DEPN=makefile.mk
diff --git a/scaddins/source/datefunc/makefile.mk b/scaddins/source/datefunc/makefile.mk
index 8aa8237089f0..a626956044e1 100644
--- a/scaddins/source/datefunc/makefile.mk
+++ b/scaddins/source/datefunc/makefile.mk
@@ -93,11 +93,9 @@ SRC1FILES =\
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS= \
-        $(VCLLIB)			\
         $(TOOLSLIB)			\
         $(CPPUHELPERLIB)	\
         $(CPPULIB)			\
-        $(VOSLIB)			\
         $(SALLIB)
 
 SHL1DEPN=makefile.mk