summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx16
-rw-r--r--jvmfwk/source/elements.cxx6
-rw-r--r--jvmfwk/source/fwkutil.cxx2
3 files changed, 12 insertions, 12 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 4ed3f21e0216..db8d537784de 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -831,9 +831,9 @@ OUString resolveDirPath(const OUString & path)
DirectoryItem item;
if (DirectoryItem::get(sResolved, item) == File::E_None)
{
- FileStatus status(FileStatusMask_Type |
- FileStatusMask_LinkTargetURL |
- FileStatusMask_FileURL);
+ FileStatus status(osl_FileStatus_Mask_Type |
+ osl_FileStatus_Mask_LinkTargetURL |
+ osl_FileStatus_Mask_FileURL);
if (item.getFileStatus(status) == File::E_None
&& status.getFileType() == FileStatus::Directory)
@@ -865,9 +865,9 @@ OUString resolveFilePath(const OUString & path)
DirectoryItem item;
if (DirectoryItem::get(sResolved, item) == File::E_None)
{
- FileStatus status(FileStatusMask_Type |
- FileStatusMask_LinkTargetURL |
- FileStatusMask_FileURL);
+ FileStatus status(osl_FileStatus_Mask_Type |
+ osl_FileStatus_Mask_LinkTargetURL |
+ osl_FileStatus_Mask_FileURL);
if (item.getFileStatus(status) == File::E_None
&& status.getFileType() == FileStatus::Regular)
{
@@ -1157,7 +1157,7 @@ bool makeDriveLetterSame(OUString * fileURL)
DirectoryItem item;
if (DirectoryItem::get(*fileURL, item) == File::E_None)
{
- FileStatus status(FileStatusMask_FileURL);
+ FileStatus status(osl_FileStatus_Mask_FileURL);
if (item.getFileStatus(status) == File::E_None)
{
*fileURL = status.getFileURL();
@@ -1246,7 +1246,7 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
File::RC errNext = File::E_None;
while( (errNext = aCollectionDir.getNextItem(curIt)) == File::E_None)
{
- FileStatus aStatus(FileStatusMask_FileURL);
+ FileStatus aStatus(osl_FileStatus_Mask_FileURL);
File::RC errStatus = File::E_None;
if ((errStatus = curIt.getFileStatus(aStatus)) != File::E_None)
{
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 6ffb07a5ee0b..bb5cf62ba952 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -750,9 +750,9 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
if (File::E_None == rc)
{
::osl::FileStatus stat(
- FileStatusMask_Validate
- | FileStatusMask_CreationTime
- | FileStatusMask_ModifyTime);
+ osl_FileStatus_Mask_Validate
+ | osl_FileStatus_Mask_CreationTime
+ | osl_FileStatus_Mask_ModifyTime);
File::RC rc_stat = item.getFileStatus(stat);
if (File::E_None == rc_stat)
{
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 3b73534e129e..8b700922d3aa 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -330,7 +330,7 @@ jfw::FileStatus checkFileURL(const rtl::OUString & sURL)
File::RC rc_item = DirectoryItem::get(sURL, item);
if (File::E_None == rc_item)
{
- osl::FileStatus status(FileStatusMask_Validate);
+ osl::FileStatus status(osl_FileStatus_Mask_Validate);
File::RC rc_stat = item.getFileStatus(status);
if (File::E_None == rc_stat)