summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2001-11-09 14:29:34 +0000
committerMathias Bauer <mba@openoffice.org>2001-11-09 14:29:34 +0000
commitbca3d72a8997a72de1a79fe636ff23dcadab4114 (patch)
treeb9d904c2e01779696afb2cfb04930e023da85b46
parent430bec64ca3fd25913090744ca16ebd766d793f5 (diff)
#93937#: save loaded documents
-rw-r--r--sfx2/source/dialog/acccfg.cxx12
-rw-r--r--sfx2/source/dialog/cfg.cxx12
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx5
3 files changed, 21 insertions, 8 deletions
diff --git a/sfx2/source/dialog/acccfg.cxx b/sfx2/source/dialog/acccfg.cxx
index 086faf35565c..fc730b5e2577 100644
--- a/sfx2/source/dialog/acccfg.cxx
+++ b/sfx2/source/dialog/acccfg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: acccfg.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: mba $ $Date: 2001-09-06 08:47:58 $
+ * last change: $Author: mba $ $Date: 2001-11-09 15:26:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -83,6 +83,7 @@
#include "objsh.hxx"
#include "dispatch.hxx"
#include "sfxtypes.hxx"
+#include "request.hxx"
//static const char __FAR_DATA pUnknownStr[] = "???";
static USHORT __FAR_DATA aCodeArr[] =
@@ -645,7 +646,12 @@ IMPL_LINK( SfxAcceleratorConfigPage, Save, Button *, pButton )
SfxAcceleratorManager* pAccMgr = new SfxAcceleratorManager( *pMgr, pCfgMgr );
Apply( pAccMgr, FALSE );
pCfgMgr->StoreConfigItem( *pAccMgr );
- if ( !bLoadedDocument )
+ if ( bLoadedDocument )
+ {
+ SfxRequest aReq( SID_SAVEDOC, SFX_CALLMODE_SYNCHRON, xDoc->GetPool() );
+ xDoc->ExecuteSlot( aReq );
+ }
+ else
pCfgMgr->StoreConfiguration();
delete pAccMgr;
if ( bCreated )
diff --git a/sfx2/source/dialog/cfg.cxx b/sfx2/source/dialog/cfg.cxx
index 1090ee5e37aa..d1139da2f2ce 100644
--- a/sfx2/source/dialog/cfg.cxx
+++ b/sfx2/source/dialog/cfg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cfg.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: mba $ $Date: 2001-11-02 17:03:00 $
+ * last change: $Author: mba $ $Date: 2001-11-09 15:26:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -110,6 +110,7 @@
#include "viewfrm.hxx"
#include "workwin.hxx"
#include "filedlghelper.hxx"
+#include "request.hxx"
#define _SVSTDARR_STRINGSDTOR
#include <svtools/svstdarr.hxx>
@@ -1213,7 +1214,12 @@ IMPL_LINK( SfxStatusBarConfigPage, Save, Button *, pButton )
SfxStatusBarManager* pStbMgr = new SfxStatusBarManager( this, *pMgr, pCfgMgr );
Apply( pStbMgr, FALSE );
pCfgMgr->StoreConfigItem( *pStbMgr );
- if ( !bLoadedDocument )
+ if ( bLoadedDocument )
+ {
+ SfxRequest aReq( SID_SAVEDOC, SFX_CALLMODE_SYNCHRON, xDoc->GetPool() );
+ xDoc->ExecuteSlot( aReq );
+ }
+ else
pCfgMgr->StoreConfiguration();
StatusBar* pBar = pStbMgr->GetStatusBar();
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 90faf5ac0915..98946c1d3686 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tbxitem.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: pl $ $Date: 2001-10-25 14:52:01 $
+ * last change: $Author: mba $ $Date: 2001-11-09 15:29:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -619,6 +619,7 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl
aTimer.SetTimeoutHdl( LINK( this, SfxAppToolBoxControl_Impl, Timeout ) );
rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW );
rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | TIB_DROPDOWN);
+ SetImage( String() );
}
void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )