summaryrefslogtreecommitdiff
path: root/uui/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-16 11:08:32 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-18 21:11:16 +0300
commitc6a73009747814513ab5a7277c211449c7378870 (patch)
tree2adc961b3c83deffcea251c41744f2626e476f38 /uui/source
parent18041138d3169d565755565bdbabd8de596b5ac7 (diff)
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to use those from <config_folders.h> instead. In normal builds, the end result will not change. Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'uui/source')
-rw-r--r--uui/source/newerverwarn.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index 8e4877a58b9c..5f96cdb2d94f 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+#include <config_folders.h>
+
#include "newerverwarn.hxx"
#include "newerverwarn.hrc"
#include "ids.hrc"
@@ -78,7 +81,10 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
// read keys from soffice.ini (sofficerc)
OUString sIniFileName = sProgramPath;
- sIniFileName += OUString( SAL_CONFIGFILE( "version" ) );
+#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE
+ sIniFileName += "../" LIBO_ETC_FOLDER "/";
+#endif
+ sIniFileName += SAL_CONFIGFILE( "version" );
::rtl::Bootstrap aIniFile( sIniFileName );
OUString sNotifyURL;
aIniFile.getFrom( OUString( "ODFNotifyURL" ), sNotifyURL );