summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2002-07-24 17:01:47 +0000
committerMathias Bauer <mba@openoffice.org>2002-07-24 17:01:47 +0000
commite0aefa5cc6b5b8313cd91c738dbd3edfcb2f4bf6 (patch)
tree8a2a9164d310c4fb8540d60664a7a04251df907b /sfx2
parent2df76ae82fa3cda7edfea77b78864e0347e9250e (diff)
#101305#
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/view/frmload.cxx19
-rw-r--r--sfx2/source/view/viewfrm.cxx18
2 files changed, 31 insertions, 6 deletions
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 34b69f8f7d7a..4010208e71e4 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: frmload.cxx,v $
*
- * $Revision: 1.53 $
+ * $Revision: 1.54 $
*
- * last change: $Author: mba $ $Date: 2002-07-18 15:08:45 $
+ * last change: $Author: mba $ $Date: 2002-07-24 18:01:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -170,7 +170,13 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
sal_Bool bReadOnlyTest = sal_False;
for( sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
- if( rArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")) )
+ if( rArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
+ {
+ ::rtl::OUString sTemp;
+ rArgs[nProperty].Value >>= sTemp;
+ rURL = sTemp;
+ }
+ else if( !rURL.Len() && rArgs[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")) )
{
::rtl::OUString sTemp;
rArgs[nProperty].Value >>= sTemp;
@@ -453,7 +459,12 @@ IMPL_LINK( SfxFrameLoader_Impl, LoadDone_Impl, void*, pVoid )
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
// extract properties
- if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")) )
+ if( lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
+ {
+ lDescriptor[nProperty].Value >>= sTemp;
+ aURL = sTemp;
+ }
+ else if( !aURL.Len() && lDescriptor[nProperty].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("FileName")) )
{
lDescriptor[nProperty].Value >>= sTemp;
aURL = sTemp;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index a855eda80e9e..a49e08d20a07 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewfrm.cxx,v $
*
- * $Revision: 1.60 $
+ * $Revision: 1.61 $
*
- * last change: $Author: mba $ $Date: 2002-07-23 13:16:01 $
+ * last change: $Author: mba $ $Date: 2002-07-24 18:01:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -3513,6 +3513,20 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
break;
}
+ case SID_STOP_RECORDING :
+ {
+ ::rtl::OUString sProperty = rtl::OUString::createFromAscii("DispatchRecorderSupplier");
+ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
+ GetFrame()->GetFrameInterface(),
+ com::sun::star::uno::UNO_QUERY);
+
+ com::sun::star::uno::Any aProp = xSet->getPropertyValue(sProperty);
+ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier;
+ if ( !(aProp >>= xSupplier) || !xSupplier.is() )
+ rSet.DisableItem( nWhich );
+ break;
+ }
+
case SID_TOGGLESTATUSBAR:
{
rSet.Put( SfxBoolItem( nWhich, GetObjectShell()->GetToolBoxConfig_Impl()->IsStatusBarVisible() ) );