summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorBartosz Kosiorek <gang65@poczta.onet.pl>2018-11-27 11:40:49 +0100
committerBartosz Kosiorek <gang65@poczta.onet.pl>2018-11-29 14:08:26 +0100
commit9c0d40fbc7d01ff46b78b798361bf3a19cc18bdc (patch)
treea2afd07ced2da313c5cdc6183bb1ea7e832d9a7e /fpicker
parenta55d15e27f4290b9aaf5597161b2b3c5200d3f85 (diff)
Rename Mac OS X to official name macOS in comments and documentation
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95 Reviewed-on: https://gerrit.libreoffice.org/64102 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/README2
-rw-r--r--fpicker/source/aqua/ControlHelper.mm2
-rw-r--r--fpicker/source/aqua/SalAquaPicker.mm2
3 files changed, 3 insertions, 3 deletions
diff --git a/fpicker/README b/fpicker/README
index e0366e0a32d8..ea21095c1601 100644
--- a/fpicker/README
+++ b/fpicker/README
@@ -1 +1 @@
-Native file pickers for OS X and Windows (file open dialog).
+Native file pickers for macOS and Windows (file open dialog).
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm
index cd67c04b037f..70cbbf190238 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -583,7 +583,7 @@ void ControlHelper::createControls()
}
}
- //preview is always on with Mac OS X
+ //preview is always on with macOS
NSControl *pPreviewBox = m_pToggles[PREVIEW];
if (pPreviewBox != nil) {
[pPreviewBox setEnabled:NO];
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index b6f40989e9cb..0b235bb92dff 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -89,7 +89,7 @@ void SalAquaPicker::implInitialize()
* [(NSSavePanel*)m_pDialog setExtensionHidden:YES];
* here but unfortunately this
* a) only works when the dialog is already displayed because it seems to act on the corresponding checkbox (that we don't show but that doesn't matter)
- * b) Mac OS X saves this setting on an application-based level which means that the last state is always being restored again when the app runs for the next time
+ * b) macOS saves this setting on an application-based level which means that the last state is always being restored again when the app runs for the next time
*
* So the only reliable way seems to be using the NSUserDefaults object because that is where that value is stored and
* to just overwrite it if it has the wrong value.