[Libreoffice-commits] core.git: include/svx svx/source

[David Tardon]

 include/svx/galmisc.hxx          |    2 +-
 svx/source/gallery2/galmisc.cxx  |    4 ++--
 svx/source/gallery2/galobj.cxx   |    2 +-
 svx/source/gallery2/galtheme.cxx |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b1259761aab67335a353efecbe42a811ff5ba1dc
Author: David Tardon <dtar...@redhat.com>
Date:   Wed Apr 29 13:03:07 2015 +0200

    WaE: declaration of ‘FILE’ shadows a global declaration
    
    Change-Id: I544e1154c846a8b5da4ab3dee72e3aa1332557e6

diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 39e280a..c833b08 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -71,7 +71,7 @@ enum SgaObjKind
 
 enum class GalleryGraphicImportRet
 {
-    NONE, FILE, INET
+    IMPORT_NONE, IMPORT_FILE, IMPORT_INET
 };
 
 #define GALLERY_PROGRESS_RANGE  10000
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index c2e1298..c2bbb6f 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -85,7 +85,7 @@ IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, 
pObjFactory )
 GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, 
Graphic& rGraphic,
                              OUString& rFilterName, bool bShowProgress )
 {
-    GalleryGraphicImportRet  nRet = GalleryGraphicImportRet::NONE;
+    GalleryGraphicImportRet  nRet = GalleryGraphicImportRet::IMPORT_NONE;
     SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), 
StreamMode::READ );
 
     aMedium.Download();
@@ -101,7 +101,7 @@ GalleryGraphicImportRet GalleryGraphicImport( const 
INetURLObject& rURL, Graphic
         if( !rGraphicFilter.ImportGraphic( rGraphic, rURL.GetMainURL( 
INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) )
         {
             rFilterName = rGraphicFilter.GetImportFormatName( nFormat );
-            nRet = GalleryGraphicImportRet::FILE;
+            nRet = GalleryGraphicImportRet::IMPORT_FILE;
         }
     }
 
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 9e300ec..299abab 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -278,7 +278,7 @@ SgaObjectBmp::SgaObjectBmp( const INetURLObject& rURL )
     Graphic aGraphic;
     OUString  aFilter;
 
-    if ( GalleryGraphicImportRet::NONE != GalleryGraphicImport( rURL, 
aGraphic, aFilter ) )
+    if ( GalleryGraphicImportRet::IMPORT_NONE != GalleryGraphicImport( rURL, 
aGraphic, aFilter ) )
         Init( aGraphic, rURL );
 }
 
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index c872839..9fd5675 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -553,7 +553,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, 
GalleryProgress* pProg
                 {
                     aGraphic.Clear();
 
-                    if ( GalleryGraphicImport( aURL, aGraphic, aFormat ) != 
GalleryGraphicImportRet::NONE )
+                    if ( GalleryGraphicImport( aURL, aGraphic, aFormat ) != 
GalleryGraphicImportRet::IMPORT_NONE )
                     {
                         boost::scoped_ptr<SgaObject> pNewObj;
 
@@ -790,7 +790,7 @@ bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& 
rGraphic, bool bProgre
             case( SGA_OBJ_INET ):
             {
                 OUString aFilterDummy;
-                bRet = ( GalleryGraphicImport( aURL, rGraphic, aFilterDummy, 
bProgress ) != GalleryGraphicImportRet::NONE );
+                bRet = ( GalleryGraphicImport( aURL, rGraphic, aFilterDummy, 
bProgress ) != GalleryGraphicImportRet::IMPORT_NONE );
             }
             break;
 
@@ -1108,9 +1108,9 @@ bool GalleryTheme::InsertURL( const INetURLObject& rURL, 
sal_uIntPtr nInsertPos
     const GalleryGraphicImportRet nImportRet = GalleryGraphicImport( rURL, 
aGraphic, aFormat );
     bool            bRet = false;
 
-    if( nImportRet != GalleryGraphicImportRet::NONE )
+    if( nImportRet != GalleryGraphicImportRet::IMPORT_NONE )
     {
-        if ( GalleryGraphicImportRet::INET == nImportRet )
+        if ( GalleryGraphicImportRet::IMPORT_INET == nImportRet )
             pNewObj.reset((SgaObject*) new SgaObjectINet( aGraphic, rURL, 
aFormat ));
         else if ( aGraphic.IsAnimated() )
             pNewObj.reset((SgaObject*) new SgaObjectAnim( aGraphic, rURL, 
aFormat ));

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits