remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (libs-gui)

15 files changed, 23 insertions, 159 deletions

diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index de636191b1aa..71bb06181206 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -67,7 +67,7 @@ static bool makeCanonicalFileURL( rtl::OUString & rURL )
         if ( osl::DirectoryItem::get( aNormalizedURL, aDirItem )
                 == osl::DirectoryItem::E_None )
         {
-            osl::FileStatus aFileStatus( FileStatusMask_FileURL );
+            osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
 
             if ( aDirItem.getFileStatus( aFileStatus )
                     == osl::DirectoryItem::E_None )
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index 8fc55c2e5428..e8c614450ca9 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -229,7 +229,7 @@ static bool is_dir( ByteString const& name )
     FileBase::getFileURLFromSystemPath( sFileURL, sFileURL );
     if( DirectoryItem::get( sFileURL, aItem ) == FileBase::E_None )
     {
-        FileStatus aStatus(FileStatusMask_Type);
+        FileStatus aStatus(osl_FileStatus_Mask_Type);
         if( aItem.getFileStatus( aStatus ) == FileBase::E_None )
         {
             if( aStatus.getFileType() == FileStatus::Directory )
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 8dfb47303fd1..4bcdef565e90 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -1162,10 +1162,10 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
     aTreeFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/help.tree"));
     osl::DirectoryItem aTreeFileItem;
     osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL, aTreeFileItem );
-    osl::FileStatus aFileStatus( FileStatusMask_FileSize );
+    osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
     if( rcGet == osl::FileBase::E_None &&
         aTreeFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None &&
-        aFileStatus.isValid( FileStatusMask_FileSize ) )
+        aFileStatus.isValid( osl_FileStatus_Mask_FileSize ) )
     {
         sal_uInt64 ret, len = aFileStatus.getFileSize();
         char* s = new char[ int(len) ];  // the buffer to hold the installed files
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 41950f8b1864..0a1cee5e557f 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -108,8 +108,8 @@ void padmin::FindFiles( const String& rDirectory, ::std::list< String >& rResult
     DirectoryItem aItem;
     while( aDir.getNextItem( aItem ) == FileBase::E_None )
     {
-        FileStatus aStatus( FileStatusMask_FileName         |
-                            FileStatusMask_Type
+        FileStatus aStatus( osl_FileStatus_Mask_FileName            |
+                            osl_FileStatus_Mask_Type
                             );
         if( aItem.getFileStatus( aStatus ) == FileBase::E_None )
         {
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index 721dece14b5e..b39998dc57f4 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -106,13 +106,13 @@ INetURLObject LockFileCommon::ResolveLinks( const INetURLObject& aDocURL )
         // there is currently no UCB functionality to resolve the symbolic links;
         // since the lock files are used only for local file systems the osl functionality is used directly
 
-        ::osl::FileStatus aStatus( FileStatusMask_Type | FileStatusMask_LinkTargetURL );
+        ::osl::FileStatus aStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_LinkTargetURL );
         ::osl::DirectoryItem aItem;
         if ( ::osl::FileBase::E_None == ::osl::DirectoryItem::get( aURLToCheck, aItem )
           && aItem.is() && ::osl::FileBase::E_None == aItem.getFileStatus( aStatus ) )
         {
-            if ( aStatus.isValid( FileStatusMask_Type )
-              && aStatus.isValid( FileStatusMask_LinkTargetURL )
+            if ( aStatus.isValid( osl_FileStatus_Mask_Type )
+              && aStatus.isValid( osl_FileStatus_Mask_LinkTargetURL )
               && aStatus.getFileType() == ::osl::FileStatus::Link )
             {
                 aURLToCheck = aStatus.getLinkTargetURL();
diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index abd0f3439c81..6a3d04107420 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -67,7 +67,7 @@ bool FileChangedChecker::getCurrentModTime(TimeValue& o_rValue) const
 
     // Retrieve the status - we are only interested in last File
     // Modified time
-    osl::FileStatus aStatus( FileStatusMask_ModifyTime );
+    osl::FileStatus aStatus( osl_FileStatus_Mask_ModifyTime );
     if( osl::FileBase::E_None != aItem.getFileStatus(aStatus) )
         return false;
 
diff --git a/svtools/workben/treecontrol/treetest.cxx b/svtools/workben/treecontrol/treetest.cxx
index 0fd806f1c5ba..7209159c9ca5 100644
--- a/svtools/workben/treecontrol/treetest.cxx
+++ b/svtools/workben/treecontrol/treetest.cxx
@@ -218,7 +218,7 @@ void DirectoryTree::fillNode( const Reference< XMutableTreeNode >& xNode )
         if( aDirectory.open() == osl::Directory::E_None )
         {
             osl::DirectoryItem aItem;
-            osl::FileStatus fs( FileStatusMask_Type | FileStatusMask_FileURL);
+            osl::FileStatus fs( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL);
             while( aDirectory.getNextItem( aItem, 0xffffffff ) == osl::Directory::E_None )
             {
                 if (aItem.getFileStatus(fs) == osl::FileBase::E_None)
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index d68b71f255ae..84365d97a79c 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -242,7 +242,7 @@ void ResMgrContainer::init()
             DirectoryItem aItem;
             while( aDir.getNextItem( aItem ) == FileBase::E_None )
             {
-                FileStatus aStatus(FileStatusMask_FileName);
+                FileStatus aStatus(osl_FileStatus_Mask_FileName);
                 if( aItem.getFileStatus( aStatus ) == FileBase::E_None )
                 {
                     OUString aFileName = aStatus.getFileName();
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index b19ee6a3683f..8c5b9344a5f4 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -233,9 +233,9 @@ bool implNormalizeURL(OUString & _sURL, osl::DirectoryItem& aDirItem)
 
     OSL_PRECOND(aDirItem.is(), "Opened DirItem required");
 
-    static const sal_uInt32 cFileStatusMask = FileStatusMask_FileURL;
+    static const sal_uInt32 cosl_FileStatus_Mask = osl_FileStatus_Mask_FileURL;
 
-    FileStatus aFileStatus(cFileStatusMask);
+    FileStatus aFileStatus(cosl_FileStatus_Mask);
 
     if (aDirItem.getFileStatus(aFileStatus) != DirectoryItem::E_None)
         return false;
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index b0ceb14b1a57..99f0b85d68b8 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -259,7 +259,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru
                  // but if there is a folder with such name proceed further
 
                  DirectoryItem aTmpItem;
-                 FileStatus aTmpStatus( FileStatusMask_Type );
+                 FileStatus aTmpStatus( osl_FileStatus_Mask_Type );
                  if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None
                    || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None
                    || aTmpStatus.getFileType() != FileStatus::Directory )
@@ -324,7 +324,7 @@ umask(old_mode);
                 // but if there is a folder with such name proceed further
 
                 DirectoryItem aTmpItem;
-                FileStatus aTmpStatus( FileStatusMask_Type );
+                FileStatus aTmpStatus( osl_FileStatus_Mask_Type );
                 if ( DirectoryItem::get( aTmp, aTmpItem ) != FileBase::E_None
                   || aTmpItem.getFileStatus( aTmpStatus ) != FileBase::E_None
                   || aTmpStatus.getFileType() != FileStatus::Directory )
diff --git a/vcl/inc/vcl/vclenum.hxx b/vcl/inc/vcl/vclenum.hxx
index 80b84b2fb0f2..a833d0594f07 100644
--- a/vcl/inc/vcl/vclenum.hxx
+++ b/vcl/inc/vcl/vclenum.hxx
@@ -31,6 +31,7 @@
 
 #include <sal/types.h>
 #include <tools/solar.h>
+#include <tools/fontenum.hxx>
 
 #ifndef ENUM_TIMEFIELDFORMAT_DECLARED
 #define ENUM_TIMEFIELDFORMAT_DECLARED
@@ -144,143 +145,6 @@ enum RasterOp { ROP_OVERPAINT, ROP_XOR, ROP_0, ROP_1, ROP_INVERT };
 
 // ------------------------------------------------------------
 
-#ifndef ENUM_FONTFAMILY_DECLARED
-#define ENUM_FONTFAMILY_DECLARED
-
-enum FontFamily { FAMILY_DONTKNOW, FAMILY_DECORATIVE, FAMILY_MODERN,
-                  FAMILY_ROMAN, FAMILY_SCRIPT, FAMILY_SWISS, FAMILY_SYSTEM, FontFamily_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_FONTPITCH_DECLARED
-#define ENUM_FONTPITCH_DECLARED
-
-enum FontPitch { PITCH_DONTKNOW, PITCH_FIXED, PITCH_VARIABLE, FontPitch_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_TEXTALIGN_DECLARED
-#define ENUM_TEXTALIGN_DECLARED
-
-enum TextAlign { ALIGN_TOP, ALIGN_BASELINE, ALIGN_BOTTOM, TextAlign_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_FONTWEIGHT_DECLARED
-#define ENUM_FONTWEIGHT_DECLARED
-
-enum FontWeight { WEIGHT_DONTKNOW, WEIGHT_THIN, WEIGHT_ULTRALIGHT,
-                  WEIGHT_LIGHT, WEIGHT_SEMILIGHT, WEIGHT_NORMAL,
-                  WEIGHT_MEDIUM, WEIGHT_SEMIBOLD, WEIGHT_BOLD,
-                  WEIGHT_ULTRABOLD, WEIGHT_BLACK, FontWeight_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_FONTWIDTH_DECLARED
-#define ENUM_FONTWIDTH_DECLARED
-
-enum FontWidth { WIDTH_DONTKNOW, WIDTH_ULTRA_CONDENSED, WIDTH_EXTRA_CONDENSED,
-                 WIDTH_CONDENSED, WIDTH_SEMI_CONDENSED, WIDTH_NORMAL,
-                 WIDTH_SEMI_EXPANDED, WIDTH_EXPANDED, WIDTH_EXTRA_EXPANDED,
-                 WIDTH_ULTRA_EXPANDED,
-                 FontWidth_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_FONTITALIC_DECLARED
-#define ENUM_FONTITALIC_DECLARED
-
-enum FontItalic { ITALIC_NONE, ITALIC_OBLIQUE, ITALIC_NORMAL, ITALIC_DONTKNOW, FontItalic_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_FONTUNDERLINE_DECLARED
-#define ENUM_FONTUNDERLINE_DECLARED
-
-enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
-                     UNDERLINE_DOTTED, UNDERLINE_DONTKNOW,
-                     UNDERLINE_DASH, UNDERLINE_LONGDASH,
-                     UNDERLINE_DASHDOT, UNDERLINE_DASHDOTDOT,
-                     UNDERLINE_SMALLWAVE,
-                     UNDERLINE_WAVE, UNDERLINE_DOUBLEWAVE,
-                     UNDERLINE_BOLD, UNDERLINE_BOLDDOTTED,
-                     UNDERLINE_BOLDDASH, UNDERLINE_BOLDLONGDASH,
-                     UNDERLINE_BOLDDASHDOT, UNDERLINE_BOLDDASHDOTDOT,
-                     UNDERLINE_BOLDWAVE,
-                     FontUnderline_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_FONTSTRIKEOUT_DECLARED
-#define ENUM_FONTSTRIKEOUT_DECLARED
-
-enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE,
-                     STRIKEOUT_DONTKNOW, STRIKEOUT_BOLD,
-                     STRIKEOUT_SLASH, STRIKEOUT_X,
-                     FontStrikeout_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_FONTEMPHASISMARK_DECLARED
-#define ENUM_FONTEMPHASISMARK_DECLARED
-
-typedef sal_uInt16 FontEmphasisMark;
-#define EMPHASISMARK_NONE           ((FontEmphasisMark)0x0000)
-#define EMPHASISMARK_DOT            ((FontEmphasisMark)0x0001)
-#define EMPHASISMARK_CIRCLE         ((FontEmphasisMark)0x0002)
-#define EMPHASISMARK_DISC           ((FontEmphasisMark)0x0003)
-#define EMPHASISMARK_ACCENT         ((FontEmphasisMark)0x0004)
-#define EMPHASISMARK_STYLE          ((FontEmphasisMark)0x00FF)
-#define EMPHASISMARK_POS_ABOVE      ((FontEmphasisMark)0x1000)
-#define EMPHASISMARK_POS_BELOW      ((FontEmphasisMark)0x2000)
-
-// Only for kompability
-#define EMPHASISMARK_DOTS_ABOVE     (EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE)
-#define EMPHASISMARK_DOTS_BELOW     (EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW)
-#define EMPHASISMARK_SIDE_DOTS      (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE)
-#define EMPHASISMARK_CIRCLE_ABOVE   (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE)
-
-#endif
-
-// ------------------------------------------------------------
-
-#ifndef ENUM_FONTTYPE_DECLARED
-#define ENUM_FONTTYPE_DECLARED
-
-enum FontType { TYPE_DONTKNOW, TYPE_RASTER, TYPE_VECTOR, TYPE_SCALABLE,
-                FontType_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-
-#endif
-
-#ifndef ENUM_FONTEMBEDDEDBITMAP_DECLARED
-#define ENUM_FONTEMBEDDEDBITMAP_DECLARED
-
-enum FontEmbeddedBitmap { EMBEDDEDBITMAP_DONTKNOW, EMBEDDEDBITMAP_FALSE, EMBEDDEDBITMAP_TRUE };
-
-#endif
-
-#ifndef ENUM_FONTANTIALIAS_DECLARED
-#define ENUM_FONTANTIALIAS_DECLARED
-
-enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE };
-
-#endif
 
 #ifndef ENUM_FONTAUTOHINT_DECLARED
 #define ENUM_FONTAUTOHINT_DECLARED
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index 82fa925097ee..b87e5d94d95f 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -630,7 +630,7 @@ long FreetypeManager::AddFontDir( const String& rUrlName )
     rtl_TextEncoding theEncoding = osl_getThreadTextEncoding();
     while( (rcOSL = aDir.getNextItem( aDirItem, 20 )) == osl::FileBase::E_None )
     {
-        osl::FileStatus aFileStatus( FileStatusMask_FileURL );
+        osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
         rcOSL = aDirItem.getFileStatus( aFileStatus );
 
         ::rtl::OUString aUSytemPath;
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index 30d4598568d2..67f4f7e719c7 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.cxx
@@ -401,7 +401,7 @@ static osl::FileBase::RC resolveLink( const rtl::OUString& i_rURL, rtl::OUString
 
     if( ( aRet = osl::DirectoryItem::get( i_rURL, aLinkItem ) ) == osl::FileBase::E_None )
     {
-        osl::FileStatus aStatus( FileStatusMask_FileName | FileStatusMask_Type | FileStatusMask_LinkTargetURL );
+        osl::FileStatus aStatus( osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type | osl_FileStatus_Mask_LinkTargetURL );
         if( ( aRet = aLinkItem.getFileStatus( aStatus ) ) == osl::FileBase::E_None )
         {
             if( aStatus.getFileType() == osl::FileStatus::Link )
@@ -443,7 +443,7 @@ void PPDParser::scanPPDDir( const String& rDir )
         INetURLObject aPPDDir(rDir);
         while( aDir.getNextItem( aItem ) == osl::FileBase::E_None )
         {
-            osl::FileStatus aStatus( FileStatusMask_FileName );
+            osl::FileStatus aStatus( osl_FileStatus_Mask_FileName );
             if( aItem.getFileStatus( aStatus ) == osl::FileBase::E_None )
             {
                 rtl::OUStringBuffer aURLBuf( rDir.Len() + 64 );
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index e4634ab0c8b5..3ae876b1a36b 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.cxx
@@ -194,7 +194,7 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
         }
         else
         {
-            FileStatus aStatus( FileStatusMask_ModifyTime );
+            FileStatus aStatus( osl_FileStatus_Mask_ModifyTime );
             if( aItem.getFileStatus( aStatus ) )
                 bChanged = true; // unlikely but not impossible
             else
@@ -370,7 +370,7 @@ void PrinterInfoManager::initialize()
 
 
         FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aUniPath );
-        FileStatus aStatus( FileStatusMask_ModifyTime );
+        FileStatus aStatus( osl_FileStatus_Mask_ModifyTime );
         DirectoryItem aItem;
 
         // setup WatchFile list
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index f87cfaec386f..c7e35143b107 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2441,7 +2441,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
 
             while( aFontDir.getNextItem( aDirItem, 10 ) == osl::FileBase::E_None )
             {
-                osl::FileStatus aFileStatus( FileStatusMask_FileURL );
+                osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
                 rcOSL = aDirItem.getFileStatus( aFileStatus );
                 if ( rcOSL == osl::FileBase::E_None )
                     AddTempDevFont( pFontList, aFileStatus.getFileURL(), aEmptyString );