[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - connectivity/source officecfg/registry sfx2/source

[Oliver-Rainer Wittmann]

 connectivity/source/resource/conn_shared_res.src          |    2 
 officecfg/registry/data/org/openoffice/Office/makefile.mk |    4 +
 sfx2/source/doc/docfile.cxx                               |   35 +++++++++++++-
 3 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit 335891f630924e6080ac887efd9aa8811404a307
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Mon Jul 1 09:54:24 2013 +0000

    121143: SfxMedium - assure that name of internal used temporary file does not clash with SfxMedium's name

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2bca9f9..02a17a2 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -585,7 +585,9 @@ Reference < XContent > SfxMedium::GetContent() const
 SvStream* SfxMedium::GetInStream()
 {
     if ( pInStream )
+    {
         return pInStream;
+    }
 
     if ( pImp->pTempFile )
     {
@@ -601,13 +603,17 @@ SvStream* SfxMedium::GetInStream()
             pInStream = NULL;
         }
         else
+        {
             return pInStream;
+        }
     }
 
     GetMedium_Impl();
 
     if ( GetError() )
+    {
         return NULL;
+    }
 
     return pInStream;
 }
@@ -2330,14 +2336,20 @@ void SfxMedium::GetMedium_Impl()
 
         //TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor
         if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() )
+        {
             SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+        }
 
         if ( !GetError() )
         {
             if ( pImp->xStream.is() )
+            {
                 pInStream = utl::UcbStreamHelper::CreateStream( pImp->xStream );
+            }
             else if ( pImp->xInputStream.is() )
+            {
                 pInStream = utl::UcbStreamHelper::CreateStream( pImp->xInputStream );
+            }
         }
 
         pImp->bDownloadDone = sal_True;
@@ -3455,7 +3467,15 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
         aName = String();
     }
 
-    pImp->pTempFile = new ::utl::TempFile();
+    do
+    {
+        pImp->pTempFile = new ::utl::TempFile();
+        if ( GetName().Equals( pImp->pTempFile->GetURL() ) )
+        {
+            delete pImp->pTempFile;
+            pImp->pTempFile = NULL;
+        }
+    } while ( pImp->pTempFile == NULL );
     pImp->pTempFile->EnableKillingFile( sal_True );
     aName = pImp->pTempFile->GetFileName();
     ::rtl::OUString aTmpURL = pImp->pTempFile->GetURL();
@@ -3551,9 +3571,20 @@ void SfxMedium::CreateTempFileNoCopy()
 {
     // this call always replaces the existing temporary file
     if ( pImp->pTempFile )
+    {
         delete pImp->pTempFile;
+        pImp->pTempFile = NULL;
+    }
 
-    pImp->pTempFile = new ::utl::TempFile();
+    do
+    {
+        pImp->pTempFile = new ::utl::TempFile();
+        if ( GetName().Equals( pImp->pTempFile->GetURL() ) )
+        {
+            delete pImp->pTempFile;
+            pImp->pTempFile = NULL;
+        }
+    } while ( pImp->pTempFile == NULL );
     pImp->pTempFile->EnableKillingFile( sal_True );
     aName = pImp->pTempFile->GetFileName();
     if ( !aName.Len() )
commit 8f23dda62c32085f8665483e38345ee13389860e
Author: Andre Fischer <af at apache.org>
Date:   Mon Jul 1 09:18:36 2013 +0000

    122658: Fixed typo in localized string.
    
    Found by: jteera
    Reported by: Andrea Pescetti

diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index 442328c..dd2b0ec 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -396,7 +396,7 @@ String STR_COULD_NOT_CREATE_INDEX_NAME
 };
 String STR_COULD_NOT_CREATE_INDEX_KEYSIZE
 {
-    Text [ en-US ] = "The index could not be created. The size of the chosen column is to big.";
+    Text [ en-US ] = "The index could not be created. The size of the chosen column is too big.";
 };
 
 String STR_SQL_NAME_ERROR
commit 4b22bc8d225baf9abab3e6c1d7153e7a851fb6ee
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Jul 1 09:15:37 2013 +0000

    #122619# mark Impress.xcu anmd PresenterScreen.xcu as localized

diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index aa97150..dac316d 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -109,7 +109,9 @@ LOCALIZEDFILES= \
     Embedding.xcu \
     WebWizard.xcu \
     FormWizard.xcu \
-    Writer.xcu
+    Writer.xcu \
+    Impress.xcu \
+    PresenterScreen.xcu
 
 
 .INCLUDE :  target.mk