move dialog-contained widget builder into dialog baseclass

1 files changed, 1 insertions, 47 deletions

diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index b1ff8781d922..552d358bc9a0 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -151,38 +151,6 @@ void SfxModalDialog::init()
     GetDialogData_Impl();
 }
 
-#define BASEPATH_SHARE_LAYER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIConfig"))
-#define RELPATH_SHARE_LAYER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice.cfg"))
-#define SERVICENAME_PATHSETTINGS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings"))
-
-rtl::OUString getUIRootDir()
-{
-    namespace css = ::com::sun::star;
-
-    /*to-do, check if user config has an override before using shared one, etc*/
-    css::uno::Reference< css::beans::XPropertySet > xPathSettings(
-        ::comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_PATHSETTINGS),
-                css::uno::UNO_QUERY_THROW);
-
-    ::rtl::OUString sShareLayer;
-    xPathSettings->getPropertyValue(BASEPATH_SHARE_LAYER) >>= sShareLayer;
-
-    // "UIConfig" is a "multi path" ... use first part only here!
-    sal_Int32 nPos = sShareLayer.indexOf(';');
-    if (nPos > 0)
-        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)
-        sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-
-    sShareLayer += RELPATH_SHARE_LAYER; // folder
-    sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    /*to-do, can we merge all this foo with existing soffice.cfg finding code, etc*/
-    return sShareLayer;
-}
-
 // -----------------------------------------------------------------------
 
 SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId )
@@ -198,29 +166,15 @@ SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId )
     pInputSet(0),
     pOutputSet(0)
 {
-    sal_Int32 nUIid = static_cast<sal_Int32>(nUniqId);
-    rtl::OUString sPath = rtl::OUStringBuffer(getUIRootDir()).
-        append(rResId.GetResMgr()->getPrefixName()).
-        append("/ui/").
-        append(nUIid).
-        appendAscii(".ui").
-        makeStringAndClear();
-    fprintf(stderr, "path %s id %d\n", rtl::OUStringToOString(sPath, RTL_TEXTENCODING_UTF8).getStr(), nUniqId);
-
-    osl::File aUIFile(sPath);
-    osl::File::RC error = aUIFile.open(osl_File_OpenFlag_Read);
-    if (error == osl::File::E_None)
-        m_pUIBuilder = new VclBuilder(this, sPath, rtl::OString::valueOf(nUIid));
     init();
 }
 
 SfxModalDialog::SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription )
-:   ModalDialog(pParent, 0), //todo
+:   ModalDialog(pParent, rID, rUIXMLDescription),
     nUniqId(0), //todo
     pInputSet(0),
     pOutputSet(0)
 {
-    m_pUIBuilder = new VclBuilder(this, getUIRootDir() + rUIXMLDescription, rID);
     init();
 }