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>

4 files changed, 92 insertions, 102 deletions

diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx
index dca9773f5120..c76ef59d4c1a 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 cae9847de8b7..35dca280fdf5 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 1c8284a19eee..703f730433c9 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 0d9ca7786b7e..f3117b7defaf 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;
 }
 
 } }