Kaydet (Commit) d9fcfef9 authored tarafından Szymon Kłos's avatar Szymon Kłos

SaveAsRemote: corresponding dialog type

Change-Id: I5face9064bafc3c99b9a7af7809bd40a105b11bd
üst 54831384
......@@ -544,6 +544,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( Sf
uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( sal_Int8 nStoreMode )
{
if ( nStoreMode == SAVEASREMOTE_REQUESTED )
nStoreMode = SAVEAS_REQUESTED;
uno::Sequence< beans::PropertyValue > aFilterProps;
SfxFilterFlags nMust = getMustFlags( nStoreMode );
......@@ -882,6 +885,9 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
const OUString& rStandardDir,
const ::com::sun::star::uno::Sequence< OUString >& rBlackList)
{
if ( nStoreMode == SAVEASREMOTE_REQUESTED )
nStoreMode = SAVEAS_REQUESTED;
bool bUseFilterOptions = false;
::comphelper::SequenceAsHashMap::const_iterator aOverwriteIter =
......@@ -1396,7 +1402,15 @@ bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel,
bool bSetStandardName = false; // can be set only for SaveAs
// parse the slot name
bool bRemote = false;
sal_Int8 nStoreMode = getStoreModeFromSlotName( aSlotName );
if ( nStoreMode == SAVEASREMOTE_REQUESTED )
{
nStoreMode = SAVEAS_REQUESTED;
bRemote = true;
}
sal_Int8 nStatusSave = STATUS_NO_ACTION;
::comphelper::SequenceAsHashMap::const_iterator aSaveACopyIter =
......@@ -1551,7 +1565,7 @@ bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel,
{
sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG;
if( nStoreMode == SAVEASREMOTE_REQUESTED )
if( bRemote )
{
nDialog = SFX2_IMPL_DIALOG_REMOTE;
}
......
......@@ -561,7 +561,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
{
SfxErrorContext aEc( ERRCTX_SFX_SAVEASDOC, GetTitle() ); // ???
if ( nId == SID_SAVEASDOC )
if ( nId == SID_SAVEASDOC || nId == SID_SAVEASREMOTE )
{
// in case of plugin mode the SaveAs operation means SaveTo
SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, false );
......@@ -726,7 +726,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
nErrorCode = ( lErr != ERRCODE_IO_ABORT ) && ( nErrorCode == ERRCODE_NONE ) ? nErrorCode : lErr;
}
if ( nId == SID_SAVEASDOC && nErrorCode == ERRCODE_NONE )
if ( ( nId == SID_SAVEASDOC || nId == SID_SAVEASREMOTE ) && nErrorCode == ERRCODE_NONE )
{
SfxBoolItem const * saveTo = static_cast<SfxBoolItem const *>(
rReq.GetArg(SID_SAVETO, false, TYPE(SfxBoolItem)));
......
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