diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-12-04 16:36:28 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-12-04 16:36:28 +0100 |
| commit | 4db86699b1db38adfb6ca9f6f809bb5e24b83fe7 (patch) | |
| tree | fb544359c81ebb719c9cac8656791f71e28c1497 | |
| parent | 5051b2bf286ca7fa4b08afabf4354982ecc9dfe3 (diff) | |
| parent | fb9b97b0638691db387f351cec831fbacf3b3cf0 (diff) | |
CWS-TOOLING: integrate CWS ooo32gsl06_DEV300
| -rw-r--r-- | fpicker/source/aqua/SalAquaPicker.cxx | 5 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/VCL.xcu | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx index 8face272e4..c084c71a25 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); diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 299debc853..afda854cbb 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -1648,9 +1648,9 @@ <value>Default,Serif</value> </prop> </node> - <node oor:name="bitstreamveramono" oor:op="replace"> + <node oor:name="bitstreamverasansmono" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>dejavumono</value> + <value>dejavusansmono;couriernew;liberationmono</value> </prop> <prop oor:name="SubstFontsHTML"><value>monospace</value></prop> <prop oor:name="FontWeight"><value>Normal</value></prop> @@ -2377,7 +2377,7 @@ </node> <node oor:name="couriernew" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>cumberland;cumberlandamt;liberationmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> + <value>cumberland;cumberlandamt;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> </prop> <prop oor:name="SubstFontsMS"><value></value></prop> <prop oor:name="SubstFontsPS"><value>Courier</value></prop> @@ -2388,7 +2388,7 @@ </node> <node oor:name="cumberland" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>cumberlandamt;couriernew;liberationmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> + <value>cumberlandamt;couriernew;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> </prop> <prop oor:name="SubstFontsMS"> <value>Courier New</value> @@ -2411,7 +2411,7 @@ </node> <node oor:name="cumberlandamt" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>cumberland;couriernew;liberationmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> + <value>cumberland;couriernew;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> </prop> <prop oor:name="SubstFontsMS"> <value>Courier New</value> @@ -2498,9 +2498,9 @@ <value>Default,Serif</value> </prop> </node> - <node oor:name="dejavumono" oor:op="replace"> + <node oor:name="dejavusansmono" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>bitstreamveramono</value> + <value>bitstreamverasansmono;couriernew;liberationmono</value> </prop> <prop oor:name="SubstFontsHTML"><value>monospace</value></prop> <prop oor:name="FontWeight"><value>Normal</value></prop> @@ -4739,7 +4739,7 @@ </node> <node oor:name="liberationmono" oor:op="replace"> <prop oor:name="SubstFonts"> - <value>cumberland;cumberlandamt;couriernew;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> + <value>cumberland;cumberlandamt;couriernew;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value> </prop> <prop oor:name="SubstFontsMS"> <value>Courier New</value> |