Skip to content

C
core
Kaydet (Commit) c570e6d5 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Some clean up 

Change-Id: Ia954b2c7f9cabb4b8a1e5ccf59b06e25af6a1ce1
üst 0e89a49f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
vcl/source/window/dialog.cxx
Dosyayı görüntüle @ c570e6d5
...@@ -478,8 +478,6 @@ Dialog::Dialog( WindowType nType ) ...@@ -478,8 +478,6 @@ Dialog::Dialog( WindowType nType )
ImplInitDialogData(); ImplInitDialogData();
} }
#define RELPATH_SHARE_LAYER OUString("soffice.cfg")
OUString VclBuilderContainer::getUIRootDir() OUString VclBuilderContainer::getUIRootDir()
{ {
/*to-do, check if user config has an override before using shared one, etc*/ /*to-do, check if user config has an override before using shared one, etc*/
...@@ -494,12 +492,10 @@ OUString VclBuilderContainer::getUIRootDir() ...@@ -494,12 +492,10 @@ OUString VclBuilderContainer::getUIRootDir()
sShareLayer = sShareLayer.copy(0, nPos); sShareLayer = sShareLayer.copy(0, nPos);
// Note: May be an user uses URLs without a final slash! Check it ... // Note: May be an user uses URLs without a final slash! Check it ...
nPos = sShareLayer.lastIndexOf('/'); if (!sShareLayer.endsWith("/"))
if (nPos != sShareLayer.getLength()-1)
sShareLayer += "/"; sShareLayer += "/";
sShareLayer += RELPATH_SHARE_LAYER; // folder sShareLayer += "soffice.cfg/";
sShareLayer += "/";
/*to-do, can we merge all this foo with existing soffice.cfg finding code, etc*/ /*to-do, can we merge all this foo with existing soffice.cfg finding code, etc*/
return sShareLayer; return sShareLayer;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment