summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-06-05 16:35:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-06-05 17:29:13 +0200
commitc570e6d5b2c41374daf30ed90cb6de527dfc801b (patch)
treede2b87119b335955b013a298d0aeff19679e238b /vcl/source/window
parent0e89a49f67f58e0942ed4aea393ac37e22d9e12d (diff)
Some clean up
Change-Id: Ia954b2c7f9cabb4b8a1e5ccf59b06e25af6a1ce1
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/dialog.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 266a4a73dae7..cd79e743fc0c 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -478,8 +478,6 @@ Dialog::Dialog( WindowType nType )
ImplInitDialogData();
}
-#define RELPATH_SHARE_LAYER OUString("soffice.cfg")
-
OUString VclBuilderContainer::getUIRootDir()
{
/*to-do, check if user config has an override before using shared one, etc*/
@@ -494,12 +492,10 @@ OUString VclBuilderContainer::getUIRootDir()
sShareLayer = sShareLayer.copy(0, nPos);
// Note: May be an user uses URLs without a final slash! Check it ...
- nPos = sShareLayer.lastIndexOf('/');
- if (nPos != sShareLayer.getLength()-1)
+ if (!sShareLayer.endsWith("/"))
sShareLayer += "/";
- sShareLayer += RELPATH_SHARE_LAYER; // folder
- sShareLayer += "/";
+ sShareLayer += "soffice.cfg/";
/*to-do, can we merge all this foo with existing soffice.cfg finding code, etc*/
return sShareLayer;
}