summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-12-05 19:29:07 +0100
committerMathias Bauer <mba@openoffice.org>2009-12-05 19:29:07 +0100
commit8d669bc21b9d1976842ba8252d2f0fb953160bdd (patch)
tree63e5a53c8ff9c4cdff33070e177eda653922f28a /fpicker
parentf232b25c1eceb8e1c32cfd917d666b3a16b14405 (diff)
parent875ac20478f16e5107acb222c0b851b99d2e0f27 (diff)
merge to m67
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/aqua/SalAquaPicker.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx
index aaf311de020a..0188fc296af0 100644
--- a/fpicker/source/aqua/SalAquaPicker.cxx
+++ b/fpicker/source/aqua/SalAquaPicker.cxx
@@ -208,7 +208,10 @@ int SalAquaPicker::run()
}
if (retVal == NSFileHandlingPanelOKButton) {
- implsetDisplayDirectory([[NSURL fileURLWithPath:[m_pDialog directory]] OUStringForInfo:FULLPATH]);
+ NSString* pDir = [m_pDialog directory];
+ if (pDir) {
+ implsetDisplayDirectory([[NSURL fileURLWithPath:pDir] OUStringForInfo:FULLPATH]);
+ }
}
DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);