[Libreoffice-commits] .: 2 commits - sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 3 01:40:31 PST 2012
sfx2/source/appl/appopen.cxx | 37 +++-------------
sfx2/source/doc/objserv.cxx | 89 +---------------------------------------
sfx2/source/doc/templatedlg.cxx | 2
3 files changed, 13 insertions(+), 115 deletions(-)
New commits:
commit e14b5f33ceae3280b46eb97a88b949d002639568
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Mon Dec 3 10:31:33 2012 +0100
Template manager: edit opens in _default frame
Change-Id: If543da8dcd0b0c7a0c155ef08cbc67e1d3905b90
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 01a9a8a..57597c7 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -977,7 +977,7 @@ void SfxTemplateManagerDlg::OnTemplateEdit ()
try
{
xStorable = uno::Reference< XStorable >(
- mxDesktop->loadComponentFromURL(pItem->getPath(),"_blank", 0, aArgs ),
+ mxDesktop->loadComponentFromURL(pItem->getPath(),"_default", 0, aArgs ),
uno::UNO_QUERY );
}
catch( const uno::Exception& )
commit 3a5f4018d85d20d0a8ddcf8c3ab6792be239a4ab
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Mon Dec 3 10:30:57 2012 +0100
New template manager out of experimental features
Change-Id: Ieb6b590060b1ca7a497049e974909c9661f1cc14
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e7c0f6d..6e11151 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -566,37 +566,16 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
sal_Bool bNewWin = sal_False;
Window* pTopWin = GetTopWindow();
- SvtMiscOptions aMiscOptions;
- if ( !aMiscOptions.IsExperimentalMode() )
+ SfxTemplateManagerDlg aTemplDlg(NULL);
+ int nRet = aTemplDlg.Execute();
+ if ( nRet == RET_OK )
{
- SvtDocumentTemplateDialog* pDocTemplDlg = new SvtDocumentTemplateDialog( NULL );
- int nRet = pDocTemplDlg->Execute();
- if ( nRet == RET_OK )
+ rReq.Done();
+ if ( pTopWin != GetTopWindow() )
{
- rReq.Done();
- if ( pTopWin != GetTopWindow() )
- {
- // the dialogue opens a document -> a new TopWindow appears
- pTopWin = GetTopWindow();
- bNewWin = sal_True;
- }
- }
-
- delete pDocTemplDlg;
- }
- else
- {
- SfxTemplateManagerDlg aTemplDlg(NULL);
- int nRet = aTemplDlg.Execute();
- if ( nRet == RET_OK )
- {
- rReq.Done();
- if ( pTopWin != GetTopWindow() )
- {
- // the dialogue opens a document -> a new TopWindow appears
- pTopWin = GetTopWindow();
- bNewWin = sal_True;
- }
+ // the dialogue opens a document -> a new TopWindow appears
+ pTopWin = GetTopWindow();
+ bNewWin = sal_True;
}
}
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 61bb81a..722c00f 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -863,91 +863,10 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
case SID_DOCTEMPLATE:
{
// save as document templates
- SvtMiscOptions aMiscOptions;
- if ( aMiscOptions.IsExperimentalMode() )
- {
- SfxTemplateManagerDlg aDlg(NULL);
- aDlg.setDocumentModel(GetModel());
- aDlg.setSaveMode(true);
- aDlg.Execute();
- }
- else
- {
- SfxDocumentTemplateDlg *pDlg = 0;
- SfxErrorContext aEc(ERRCTX_SFX_DOCTEMPLATE,GetTitle());
- SfxDocumentTemplates *pTemplates = new SfxDocumentTemplates;
-
- if ( !rReq.GetArgs() )
- {
- pDlg = new SfxDocumentTemplateDlg(0, pTemplates);
- if ( RET_OK == pDlg->Execute() && pDlg->GetTemplateName().Len())
- {
- rReq.AppendItem(SfxStringItem(
- SID_TEMPLATE_NAME, pDlg->GetTemplateName()));
- rReq.AppendItem(SfxStringItem(
- SID_TEMPLATE_REGIONNAME, pDlg->GetRegionName()));
- }
- else
- {
- delete pDlg;
- rReq.Ignore();
- return;
- }
- }
-
- SFX_REQUEST_ARG(rReq, pRegionItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False);
- SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False);
- SFX_REQUEST_ARG(rReq, pRegionNrItem, SfxUInt16Item, SID_TEMPLATE_REGION, sal_False);
- if ( (!pRegionItem && !pRegionNrItem ) || !pNameItem )
- {
- DBG_ASSERT( rReq.IsAPI(), "non-API call without Arguments" );
- #ifndef DISABLE_SCRIPTING
- SbxBase::SetError( SbxERR_WRONG_ARGS );
- #endif
- rReq.Ignore();
- return;
- }
-
- ::rtl::OUString aTemplateName = pNameItem->GetValue();
- ::rtl::OUString aTemplateGroup;
- if ( pRegionItem )
- aTemplateGroup = pRegionItem->GetValue();
- else
- // pRegionNrItem must not be NULL, it was just checked
- aTemplateGroup = pTemplates->GetFullRegionName( pRegionNrItem->GetValue() );
- // check Group and Name
- delete pTemplates;
-
- sal_Bool bOk = sal_False;
- try
- {
- uno::Reference< frame::XStorable > xStorable( GetModel(), uno::UNO_QUERY_THROW );
- uno::Reference< frame::XDocumentTemplates > xTemplates(
- frame::DocumentTemplates::create(comphelper::getProcessComponentContext()) );
-
- bOk = xTemplates->storeTemplate( aTemplateGroup, aTemplateName, xStorable );
- }
- catch( uno::Exception& )
- {
- }
-
- DELETEX(pDlg);
-
- rReq.SetReturnValue( SfxBoolItem( 0, bOk ) );
- if ( bOk )
- {
- // update the Organizer runtime cache from the template
- // component if the cache has already been created
- // TODO/LATER: get rid of this cache duplication
- SfxDocumentTemplates aTemplates;
- aTemplates.ReInitFromComponent();
- }
- else
- {
- ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
- return;
- }
- }
+ SfxTemplateManagerDlg aDlg(NULL);
+ aDlg.setDocumentModel(GetModel());
+ aDlg.setSaveMode(true);
+ aDlg.Execute();
break;
}
More information about the Libreoffice-commits
mailing list