[Libreoffice-commits] .: 2 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc

Caolán McNamara caolan at kemper.freedesktop.org
Tue Jan 10 02:10:29 PST 2012


 binfilter/bf_basic/source/basmgr/basmgr.cxx                  |    2 
 binfilter/bf_sc/source/core/data/sc_globalx.cxx              |    2 
 binfilter/bf_sc/source/ui/docshell/sc_impex.cxx              |    4 
 binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx                |   58 ++++-----
 binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx                |    8 -
 binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx                |    2 
 binfilter/bf_svtools/source/config/svt_pathoptions.cxx       |   12 -
 binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |    4 
 binfilter/bf_svx/source/svdraw/svx_svdograf.cxx              |   67 -----------
 binfilter/bf_svx/source/svxlink/svx_fileobj.cxx              |    2 
 binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx             |    2 
 binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx              |    2 
 binfilter/inc/bf_sfx2/docfile.hxx                            |    4 
 binfilter/inc/bf_svtools/pathoptions.hxx                     |    2 
 14 files changed, 55 insertions(+), 116 deletions(-)

New commits:
commit edf439f6016fa8ab7ba7267c49cde32e201d8b06
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 9 22:36:26 2012 +0000

    force users of horrific ReadUniOrByteStringLine to provide the charset

diff --git a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
index 66fa779..3d6d3b4 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
@@ -472,13 +472,13 @@ enum DoubledQuoteMode
 /*N*/
 /*N*/   while(--nSkipLines>0)
 /*N*/   {
-/*?*/       rStrm.ReadUniOrByteStringLine( aLine );     // content is ignored
+/*?*/       rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet() );     // content is ignored
 /*?*/       if ( rStrm.IsEof() )
 /*?*/           break;
 /*N*/   }
 /*N*/   for( ;; )
 /*N*/   {
-/*N*/       rStrm.ReadUniOrByteStringLine( aLine );
+/*N*/       rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet() );
 /*N*/       if ( rStrm.IsEof() )
 /*N*/           break;
 /*N*/
commit 24e7ea4126d944958966cd9421089bc4aa76c17e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 9 21:06:04 2012 +0000

    adapt to simplified LocalFileHelper::ConvertURLToPhysicalName

diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index c551b55..efda967 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -977,7 +977,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
             if ( pLibs->aBasicLibPath.Len() )
             {
                 // Lib im Pfad suchen...
-                String aSearchFile = pInfo->GetRelStorageName();
+                rtl::OUString aSearchFile = pInfo->GetRelStorageName();
                 SvtPathOptions aPathCFG;
                 if( aPathCFG.SearchFile( aSearchFile, SvtPathOptions::PATH_BASIC ) )
                 {
diff --git a/binfilter/bf_sc/source/core/data/sc_globalx.cxx b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
index c7c06ca..9f8642c 100644
--- a/binfilter/bf_sc/source/core/data/sc_globalx.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_globalx.cxx
@@ -70,7 +70,7 @@ namespace binfilter {
 /*N*/           {
 /*N*/               //  use LocalFileHelper to convert the path to a URL that always points
 /*N*/               //  to the file on the server
-/*N*/               String aUrl;
+/*N*/               rtl::OUString aUrl;
 /*N*/               if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) )
 /*N*/                   aPath = aUrl;
 /*N*/
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 2bf7615..10b509c 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -466,12 +466,12 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/       }
 /*N*/       else
 /*N*/       {
-/*N*/           String aURL;
-/*N*/           if ( aName.Len() )
+/*N*/           rtl::OUString aURL;
+/*N*/           if ( !aName.isEmpty() )
 /*N*/               ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
 /*N*/           else if ( aLogicName.Len() )
 /*N*/               aURL = GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
-/*N*/           if ( aURL.Len() )
+/*N*/           if ( !aURL.isEmpty() )
 /*N*/               ::ucbhelper::Content::create( aURL, xEnv, pImp->aContent );
 /*N*/       }
 /*N*/     }
@@ -609,9 +609,9 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/ }
 
 //------------------------------------------------------------------
-/*N*/ const String& SfxMedium::GetPhysicalName() const
+/*N*/ const rtl::OUString& SfxMedium::GetPhysicalName() const
 /*N*/ {
-/*N*/     if ( !aName.Len() && aLogicName.Len() )
+/*N*/     if ( aName.isEmpty() && aLogicName.Len() )
 /*N*/         (( SfxMedium*)this)->CreateFileStream();
 /*N*/
 /*N*/     // return the name then
@@ -665,11 +665,11 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/
 /*N*/     if ( pImp->pTempFile )
 /*N*/     {
-/*?*/       String aURL;
-#ifdef DBG_UTIL
-/*?*/       if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL ) )
-/*?*/           OSL_FAIL("Physical name not convertable!");
-#endif
+/*?*/         rtl::OUString aURL;
+/*?*/         if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL ) )
+/*?*/         {
+/*?*/             OSL_FAIL("Physical name not convertable!");
+/*?*/         }
 /*?*/         pImp->bIsStorage = SotStorage::IsStorageFile( aURL );
 /*?*/         if ( !pImp->bIsStorage )
 /*?*/             bTriedStorage = TRUE;
@@ -706,7 +706,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/     if ( aStorage.Is() || bTriedStorage )
 /*N*/         return aStorage;
 /*N*/
-/*N*/     String aStorageName;
+/*N*/     rtl::OUString aStorageName;
 /*N*/     if ( pImp->pTempFile || pImp->pTempDir )
 /*N*/     {
 /*N*/         // open storage with the URL of the tempfile
@@ -719,12 +719,12 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/     }
 /*N*/     else
 /*N*/     {
-/*N*/         if ( aName.Len() )
+/*N*/         if ( !aName.isEmpty() )
 /*N*/         {
 /*N*/             if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aStorageName ) )
-/*N*/           {
+/*N*/             {
 /*?*/                 OSL_FAIL("Physical name not convertable!");
-/*N*/           }
+/*N*/             }
 /*N*/         }
 /*N*/         else
 /*N*/             aStorageName = GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
@@ -763,7 +763,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*?*/                       INetURLObject aObj( aName );
 /*?*/                       if ( aObj.GetProtocol() == INET_PROT_NOT_VALID )
 /*?*/                       {
-/*?*/                           String aURL;
+/*?*/                           rtl::OUString aURL;
 /*?*/                           ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
 /*?*/                           aObj.SetURL( aURL );
 /*?*/                       }
@@ -872,7 +872,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*?*/                     nStorOpenMode = SFX_STREAM_READONLY;
 /*?*/                     aStorage = new SvStorage( aTmpName, nStorOpenMode );
 /*?*/
-/*?*/                     String aTemp;
+/*?*/                     rtl::OUString aTemp;
 /*?*/                     ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpName, aTemp );
 /*?*/
 /*?*/                     pImp->bIsTemp = sal_True;
@@ -1001,11 +1001,11 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/ {
 /*N*/   if( pImp->m_bRemoveBackup )
 /*N*/   {
-#ifdef DBG_UTIL
 /*?*/       if ( pImp->m_aBackupURL.getLength() )
 /*?*/           if ( !::utl::UCBContentHelper::Kill( pImp->m_aBackupURL ) )
+/*?*/           {
 /*?*/               OSL_FAIL("Couldn't remove backup file!");
-#endif
+/*?*/           }
 /*?*/       pImp->m_bRemoveBackup = sal_False;
 /*N*/   }
 /*N*/
@@ -1023,7 +1023,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/
 /*N*/         ::utl::UcbLockBytesHandler* pHandler = pImp->aHandler;
 /*N*/         INetProtocol eProt = GetURLObject().GetProtocol();
-/*N*/         if ( (eProt != INET_PROT_HTTP && eProt != INET_PROT_FTP) || aName.Len() )
+/*N*/         if ( (eProt != INET_PROT_HTTP && eProt != INET_PROT_FTP) || !aName.isEmpty() )
 /*N*/             pHandler = NULL;
 /*N*/         BOOL bSynchron = pImp->bForceSynchron || ! pImp->aDoneLink.IsSet();
 /*N*/         SFX_ITEMSET_ARG( pSet, pStreamItem, SfxUnoAnyItem, SID_INPUTSTREAM, sal_False);
@@ -1237,7 +1237,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/         {
 /*N*/             // try to convert the URL into a physical name - but never change a physical name
 /*N*/             // physical name may be set if the logical name is changed after construction
-/*N*/             if ( !aName.Len() )
+/*N*/             if ( !aName.getLength() )
 /*N*/                 ::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), aName );
 /*N*/             else
 /*?*/                 DBG_ASSERT( pSalvageItem, "Suspicious change of logical name!" );
@@ -1455,10 +1455,10 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/     sal_uInt32 nFormat = pStorage->GetFormat();
 /*N*/     if( !nFormat )
 /*N*/     {
-/*N*/ #ifdef DBG_UTIL
 /*N*/         if( aLogicName.Len() )
+/*N*/         {
 /*N*/             OSL_FAIL( "Unbekanntes StorageFormat, versuche eigenes Format" );
-/*N*/ #endif
+/*N*/         }
 /*N*/         pFilter = SfxObjectFactory::GetDefaultFactory().GetFilterContainer()->
 /*N*/             GetFilter( 0 );
 /*N*/     }
@@ -1495,17 +1495,19 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/
 /*N*/     delete pSet;
 /*N*/
-/*N*/     #ifdef  DBG_UTIL
-/*N*/     if( pImp->bIsTemp && aName.Len() )
+/*N*/     if( pImp->bIsTemp && aName.getLength() )
 /*N*/     {
-/*N*/         String aTemp;
+/*N*/         rtl::OUString aTemp;
 /*N*/         if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aTemp ))
+/*N*/         {
 /*N*/           OSL_FAIL("Physical name not convertable!");
+/*N*/         }
 /*N*/
 /*N*/         if ( !::utl::UCBContentHelper::Kill( aTemp ) )
+/*N*/         {
 /*N*/           OSL_FAIL("Couldn't remove temporary file!");
+/*N*/         }
 /*N*/     }
-/*N*/     #endif
 /*N*/
 /*N*/     pFilter = 0;
 /*N*/
@@ -1711,7 +1713,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/     pImp->pTempFile = new ::utl::TempFile();
 /*N*/     pImp->pTempFile->EnableKillingFile( sal_True );
 /*N*/     aName = pImp->pTempFile->GetFileName();
-/*N*/     if ( !aName.Len() )
+/*N*/     if ( !aName.getLength() )
 /*N*/     {
 /*N*/         SetError( ERRCODE_IO_CANTWRITE );
 /*N*/         return;
@@ -1755,7 +1757,7 @@ void SAL_CALL SfxMediumHandler_Impl::handle(
 /*N*/     pImp->pTempFile = new ::utl::TempFile();
 /*N*/     pImp->pTempFile->EnableKillingFile( sal_True );
 /*N*/     aName = pImp->pTempFile->GetFileName();
-/*N*/     if ( !aName.Len() )
+/*N*/     if ( !aName.getLength() )
 /*N*/     {
 /*?*/         SetError( ERRCODE_IO_CANTWRITE );
 /*?*/         return;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index c325032..f4f9483 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -312,7 +312,7 @@ sal_False           Das Objekt konnte nicht geladen werden
 
     SFX_ITEMSET_ARG( pSet, pBaseItem, SfxStringItem,
                     SID_BASEURL, sal_False);
-    String aBaseURL;
+    rtl::OUString aBaseURL;
     SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False);
     if( pBaseItem )
         aBaseURL = pBaseItem->GetValue();
@@ -325,7 +325,7 @@ sal_False           Das Objekt konnte nicht geladen werden
         }
         else if ( pSalvageItem )
         {
-            String aLclName( pMed->GetPhysicalName() );
+            rtl::OUString aLclName( pMed->GetPhysicalName() );
             ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aLclName, aBaseURL );
         }
         else
@@ -392,7 +392,7 @@ sal_False           Das Objekt konnte nicht geladen werden
             if ( !GetError() )
             {
                 const String aOldURL( ::binfilter::StaticBaseUrl::GetBaseURL() );
-                if( aBaseURL.Len() ) ::binfilter::StaticBaseUrl::SetBaseURL( aBaseURL );
+                if( aBaseURL.getLength() ) ::binfilter::StaticBaseUrl::SetBaseURL( aBaseURL );
                 pImp->nLoadedFlags = 0;
                 bOk = xStor.Is() && LoadOwnFormat( *pMed );
                 ::binfilter::StaticBaseUrl::SetBaseURL( aOldURL );
@@ -414,7 +414,7 @@ sal_False           Das Objekt konnte nicht geladen werden
         bHasName = sal_True;
         // Importieren
         const String aOldURL( ::binfilter::StaticBaseUrl::GetBaseURL() );
-        if( aBaseURL.Len() )
+        if( aBaseURL.getLength() )
             ::binfilter::StaticBaseUrl::SetBaseURL( aBaseURL );
         if( !pMedium->GetFilter()->UsesStorage() )
             pMedium->GetInStream();
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
index bef8ad1..8957ccb 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
@@ -183,7 +183,7 @@ extern AsynchronLink* pPendingCloser;
 /*N*/     {
 /*?*/         if ( aPhysName == pImp->aTempName && !IsHandsOff() )
 /*?*/             HandsOff();
-/*?*/         String aTmp;
+/*?*/         rtl::OUString aTmp;
 /*?*/         ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->aTempName, aTmp );
 /*?*/         ::utl::UCBContentHelper::Kill( aTmp );
 /*N*/     }
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index 2921e16..d091052 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -279,7 +279,7 @@ const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Pathes ePath )
     if ( ePath < SvtPathOptions::PATH_COUNT )
     {
         OUString    aPathValue;
-        String      aResult;
+        OUString    aResult;
         sal_Int32   nHandle = m_aMapEnumToPropHandle[ (sal_Int32)ePath ];
 
         // Substitution is done by the service itself using the substition service
@@ -313,7 +313,7 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Pathes ePath, const String& r
 
     if ( ePath < SvtPathOptions::PATH_COUNT )
     {
-        String      aResult;
+        OUString    aResult;
         OUString    aNewValue;
         Any         a;
 
@@ -430,7 +430,7 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar )
     if ( bConvertLocal )
     {
         // Convert the URL to a system path for special path variables
-        String aReturn;
+        rtl::OUString aReturn;
         utl::LocalFileHelper::ConvertURLToPhysicalName( aWorkText, aReturn );
         return aReturn;
     }
@@ -744,10 +744,10 @@ String SvtPathOptions::UseVariable( const String& rPath )
 
 // -----------------------------------------------------------------------
 
-sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath )
+sal_Bool SvtPathOptions::SearchFile( rtl::OUString& rIniFile, Pathes ePath )
 {
     // check parameter: empty inifile name?
-    if ( !rIniFile.Len() )
+    if ( rIniFile.isEmpty() )
     {
         DBG_ERRORFILE( "SvtPathOptions::SearchFile(): invalid parameter" );
         return sal_False;
@@ -824,7 +824,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath )
                 if ( aObj.HasError() )
                 {
                     bIsURL = FALSE;
-                    String aURL;
+                    rtl::OUString aURL;
                     if ( LocalFileHelper::ConvertPhysicalNameToURL( aPathToken, aURL ) )
                         aObj.SetURL( aURL );
                 }
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
index a7dfa74..d89abe0 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
@@ -1025,7 +1025,9 @@ void GraphicFilter::ImplInit()
     {
         rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program"));
         rtl::Bootstrap::expandMacros(url); //TODO: detect failure
-        utl::LocalFileHelper::ConvertURLToPhysicalName(url, aFilterPath);
+        rtl::OUString sTmp;
+        utl::LocalFileHelper::ConvertURLToPhysicalName(url, sTmp);
+        aFilterPath = sTmp;
     }
 
     pErrorEx = new FilterErrorEx;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index 7fb2101..e475173 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -29,10 +29,7 @@
 #define _ANIMATION
 #define ITEMID_GRF_CROP 0
 
-#ifndef SVX_LIGHT
 #include <bf_so3/lnkbase.hxx>
-#else
-#endif
 
 #include <math.h>
 #include <vcl/salbtype.hxx>
@@ -67,8 +64,6 @@ namespace binfilter {
 
 #define GRAFSTREAMPOS_INVALID 0xffffffff
 
-#ifndef SVX_LIGHT
-
 // ------------------
 // - SdrGraphicLink -
 // ------------------
@@ -158,26 +153,6 @@ namespace binfilter {
 /*N*/   }
 /*N*/ }
 
-#else
-
-/*?*/ GraphicFilter* SVX_LIGHT_pGrapicFilter = NULL;
-/*?*/
-/*?*/ GraphicFilter* GetGrfFilter()
-/*?*/ {
-/*?*/   if( !SVX_LIGHT_pGrapicFilter )
-/*?*/     {
-/*?*/       const SvtPathOptions aPathOptions;
-/*?*/
-/*?*/         SVX_LIGHT_pGrapicFilter = new GraphicFilter( FALSE );
-/*?*/         SVX_LIGHT_pGrapicFilter->SetFilterPath( aPathOptions.GetFilterPath() );
-/*?*/     }
-/*?*/
-/*?*/   return SVX_LIGHT_pGrapicFilter;
-/*?*/ }
-
-
-#endif // SVX_LIGHT
-
 // --------------
 // - SdrGrafObj -
 // --------------
@@ -326,8 +301,6 @@ namespace binfilter {
 
 /*N*/ void SdrGrafObj::ImpLinkAnmeldung()
 /*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/
 /*N*/   SvxLinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL;
 /*N*/
 /*N*/   if( pLinkManager != NULL && pGraphicLink == NULL )
@@ -339,16 +312,12 @@ namespace binfilter {
 /*N*/           pGraphicLink->Connect();
 /*N*/       }
 /*N*/   }
-/*N*/
-/*N*/ #endif // SVX_LIGHT
 /*N*/ }
 
 // -----------------------------------------------------------------------------
 
 /*N*/ void SdrGrafObj::ImpLinkAbmeldung()
 /*N*/ {
-/*N*/ #ifndef SVX_LIGHT
-/*N*/
 /*N*/   SvxLinkManager* pLinkManager = pModel != NULL ? pModel->GetLinkManager() : NULL;
 /*N*/
 /*N*/   if( pLinkManager != NULL && pGraphicLink!=NULL)
@@ -357,8 +326,6 @@ namespace binfilter {
 /*?*/       pLinkManager->Remove( pGraphicLink );
 /*?*/       pGraphicLink=NULL;
 /*N*/   }
-/*N*/
-/*N*/ #endif // SVX_LIGHT
 /*N*/ }
 
 // -----------------------------------------------------------------------------
@@ -400,7 +367,6 @@ namespace binfilter {
 /*N*/ {
 /*N*/     sal_Bool  bRet = sal_False;
 /*N*/
-/*N*/ #ifndef SVX_LIGHT
 /*N*/     if( pGraphicLink )
 /*N*/     {
 /*N*/         BOOL bIsChanged = pModel->IsChanged();
@@ -409,26 +375,6 @@ namespace binfilter {
 /*N*/
 /*N*/         bRet = sal_True;
 /*N*/     }
-/*N*/ #else
-/*N*/     if( aFileName.Len() )
-/*N*/     {
-/*N*/         // #92205# Load linked graphics for player
-/*N*/         SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aFileName, STREAM_READ | STREAM_SHARE_DENYNONE );
-/*N*/
-/*N*/         if( pIStm )
-/*N*/         {
-/*N*/             Graphic           aGraphic;
-/*N*/             GraphicFilter*    pFilter = GetGrfFilter();
-/*N*/             USHORT            nError = pFilter->ImportGraphic( aGraphic, aFileName, *pIStm );
-/*N*/
-/*N*/             pGraphic->SetGraphic( aGraphic );
-/*N*/
-/*N*/             delete pIStm;
-/*N*/         }
-/*N*/
-/*N*/         bRet = sal_True;
-/*N*/     }
-/*N*/ #endif
 /*N*/
 /*N*/     return bRet;
 /*N*/ }
@@ -773,9 +719,7 @@ namespace binfilter {
 /*N*/               }
 /*N*/           }
 /*N*/
-/*N*/ #ifndef SVX_LIGHT
 /*N*/           pBmp = new Bitmap( ResId ( BMAP_GrafikEi, *ImpGetResMgr() ) );
-/*N*/ #endif
 /*N*/       }
 /*N*/
 /*N*/       ImpPaintReplacement( pOutDev, aText, pBmp, bFill );
@@ -937,8 +881,7 @@ namespace binfilter {
 /*N*/
 /*N*/   if( aFileName.Len() )
 /*N*/   {
-/*?*/ #ifndef SVX_LIGHT
-/*?*/       String aFileURLStr;
+/*?*/       rtl::OUString aFileURLStr;
 /*?*/
 /*?*/       if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aFileURLStr ) )
 /*?*/       {
@@ -954,9 +897,6 @@ namespace binfilter {
 /*?*/               delete pIStm;
 /*?*/           }
 /*?*/       }
-/*?*/ #else
-/*?*/       OSL_FAIL("SdrGrafObj::ReadDataTilV10(): SVX_LIGHT kann keine Graphic-Links");
-/*?*/ #endif
 /*N*/   }
 /*N*/   else if( nError != 0 )
 /*?*/       rIn.SetError(nError);
@@ -1303,13 +1243,8 @@ namespace binfilter {
 /*N*/           {
 /*N*/               const ULONG nSwapMode = pModel->GetSwapGraphicsMode();
 /*N*/
-/*N*/ #ifndef SVX_LIGHT
 /*N*/               if( ( ( GRAFSTREAMPOS_INVALID != nGrafStreamPos ) || pGraphic->HasUserData() || pGraphicLink ) &&
 /*N*/                   ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) )
-/*N*/ #else
-/*N*/               if( ( ( GRAFSTREAMPOS_INVALID != nGrafStreamPos ) || pGraphic->HasUserData() || aFileName.Len() ) &&
-/*N*/                   ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) )
-/*N*/ #endif
 /*N*/               {
 /*N*/                   pRet = NULL;
 /*N*/               }
diff --git a/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx b/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
index cc0cbbc..0849a14 100644
--- a/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
+++ b/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
@@ -378,7 +378,7 @@ using namespace ::com::sun::star::uno;
 /*?*/       {
 /*?*/           DBG_WARNING3( "GrafikFehler [%d] - [%s] URL[%s]",
 /*?*/                           nRes,
-/*?*/                           xMed->GetPhysicalName().GetBuffer(),
+/*?*/                           xMed->GetPhysicalName().getStr(),
 /*?*/                           sFileNm.GetBuffer() );
 /*?*/       }
 /*?*/       else
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
index 35df67c..a3d9035 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx
@@ -1599,7 +1599,7 @@ void SAL_CALL SvxGraphicObject::setPropertyValue( const OUString& aPropertyName,
 
                 if( aURLObj.GetProtocol() == INET_PROT_NOT_VALID )
                 {
-                    String aValidURL;
+                    rtl::OUString aValidURL;
 
                     if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aURL, aValidURL ) )
                         aURLObj = INetURLObject( aValidURL );
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index 53d7079..083d296 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -4920,7 +4920,7 @@ BOOL Sw6Layout::InsertLine(SwDoc &rDoc,SwPaM &rPaM,String &rStg,BOOL bLast)
                             aNam = ::binfilter::StaticBaseUrl::SmartRelToAbs( aNam );
                             if( !::binfilter::IsDocument( aNam ) )
                             {
-                                String sFNm( INetURLObject( aNam ).getName() );
+                                rtl::OUString sFNm( INetURLObject( aNam ).getName() );
                                 INetURLObject aURL( *pMyName );
                                 aURL.setName( sFNm );
                                 String sSrchGrf( aURL.GetMainURL(
diff --git a/binfilter/inc/bf_sfx2/docfile.hxx b/binfilter/inc/bf_sfx2/docfile.hxx
index c79c94e..58927d2 100644
--- a/binfilter/inc/bf_sfx2/docfile.hxx
+++ b/binfilter/inc/bf_sfx2/docfile.hxx
@@ -161,7 +161,7 @@ class SfxMedium : public SvRefBase
                         bTriedStorage;
     StreamMode          nStorOpenMode;
     INetURLObject*      pURLObj;
-    String              aName;
+    rtl::OUString       aName;
     SvGlobalName        aFilterClass;
     SvStream*           pInStream;
     SvStream*           pOutStream;
@@ -209,7 +209,7 @@ public:
     const String&       GetName() const {return aLogicName;}
     const INetURLObject& GetURLObject() const;
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > GetContent() const;
-    const String&       GetPhysicalName() const;
+    const rtl::OUString& GetPhysicalName() const;
     sal_Bool            IsTemporary() const;
     sal_Bool            IsRemote();
     sal_Bool            IsOpen() const { return aStorage.Is() || pInStream; }
diff --git a/binfilter/inc/bf_svtools/pathoptions.hxx b/binfilter/inc/bf_svtools/pathoptions.hxx
index 89a05ba..376f596 100644
--- a/binfilter/inc/bf_svtools/pathoptions.hxx
+++ b/binfilter/inc/bf_svtools/pathoptions.hxx
@@ -111,7 +111,7 @@ public:
 
     String          SubstituteVariable( const String& rVar );
     String          UseVariable( const String& rVar );
-    sal_Bool        SearchFile( String& rIniFile, Pathes ePath = PATH_USERCONFIG );
+    sal_Bool        SearchFile( rtl::OUString& rIniFile, Pathes ePath = PATH_USERCONFIG );
     sal_Bool        IsReadonly() const;
 };
 


More information about the Libreoffice-commits mailing list