summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2002-10-16 08:21:50 +0000
committerCaolán McNamara <cmc@openoffice.org>2002-10-16 08:21:50 +0000
commitaa4d36b52c33fa4b2a8d5e62042d12e4dc322bc7 (patch)
treeae6949fe07ca6906cefc5fea67e7e8b9732566c6 /sw/source/core/unocore
parenta93e3b025cadb8548c9cf29535071149c4c41cb2 (diff)
#103700# no throw readonly exception getting properties from readonly things, only on setting
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r--sw/source/core/unocore/SwXTextDefaults.cxx8
-rw-r--r--sw/source/core/unocore/unodraw.cxx6
-rw-r--r--sw/source/core/unocore/unoframe.cxx6
-rw-r--r--sw/source/core/unocore/unoobj.cxx8
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx6
-rw-r--r--sw/source/core/unocore/unosect.cxx6
-rw-r--r--sw/source/core/unocore/unostyle.cxx6
7 files changed, 14 insertions, 32 deletions
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index dbc4e6fd650a..233adce90b9d 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: SwXTextDefaults.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: tl $ $Date: 2002-10-16 08:56:04 $
+ * last change: $Author: cmc $ $Date: 2002-10-16 09:19:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -244,8 +244,6 @@ PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPrope
const SfxItemPropertyMap *pMap = SfxItemPropertyMap::GetByName( aPropSet.getPropertyMap(), rPropertyName);
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- if ( pMap->nFlags & PropertyAttribute::READONLY)
- throw PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
const SfxPoolItem& rItem = pDoc->GetDefault(pMap->nWID);
if (IsStaticDefaultItem ( &rItem ) )
@@ -292,8 +290,6 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName
const SfxItemPropertyMap *pMap = SfxItemPropertyMap::GetByName( aPropSet.getPropertyMap(), rPropertyName);
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- if ( pMap->nFlags & PropertyAttribute::READONLY)
- throw RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
Any aRet;
SfxItemPool rSet (pDoc->GetAttrPool());
const SfxPoolItem *pItem = rSet.GetPoolDefaultItem ( pMap->nWID );
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index ec87f1a7dd5b..6e3caea3dd1e 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unodraw.cxx,v $
*
- * $Revision: 1.39 $
+ * $Revision: 1.40 $
*
- * last change: $Author: os $ $Date: 2002-10-08 11:10:02 $
+ * last change: $Author: cmc $ $Date: 2002-10-16 09:19:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1437,8 +1437,6 @@ Any SwXShape::getPropertyDefault( const OUString& rPropertyName )
_pMap, rPropertyName);
if(pMap)
{
- if ( pMap->nFlags & PropertyAttribute::READONLY)
- throw RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(pMap->nWID < RES_FRMATR_END && pFmt)
{
const SfxPoolItem& rDefItem =
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 5537ead08aef..2cfde0fb090b 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoframe.cxx,v $
*
- * $Revision: 1.72 $
+ * $Revision: 1.73 $
*
- * last change: $Author: tl $ $Date: 2002-09-24 14:54:04 $
+ * last change: $Author: cmc $ $Date: 2002-10-16 09:21:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1781,8 +1781,6 @@ Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
const SfxItemPropertyMap* pCur = SfxItemPropertyMap::GetByName(_pMap, rPropertyName);
if(pCur)
{
- if ( pCur->nFlags & PropertyAttribute::READONLY )
- throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pCur->nWID < RES_FRMATR_END )
{
const SfxPoolItem& rDefItem =
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 5b2544c96e81..05df943f13c0 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoobj.cxx,v $
*
- * $Revision: 1.63 $
+ * $Revision: 1.64 $
*
- * last change: $Author: tl $ $Date: 2002-10-16 08:58:31 $
+ * last change: $Author: cmc $ $Date: 2002-10-16 09:19:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2114,8 +2114,6 @@ Any SwXTextCursor::GetPropertyDefault(
rPropSet.getPropertyMap(), rPropertyName);
if(pMap)
{
- if ( pMap->nFlags & PropertyAttribute::READONLY)
- throw RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( 0 ) );
if(pMap->nWID < RES_FRMATR_END)
{
const SfxPoolItem& rDefItem = pDoc->GetAttrPool().GetDefaultItem(pMap->nWID);
@@ -2376,8 +2374,6 @@ Sequence< Any > SAL_CALL SwXTextCursor::getPropertyDefaults( const Sequence< OUS
else
throw UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( 0 ) );
}
- if ( pMap->nFlags & PropertyAttribute::READONLY)
- throw RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( 0 ) );
if(pMap->nWID < RES_FRMATR_END)
{
const SfxPoolItem& rDefItem = pDoc->GetAttrPool().GetDefaultItem(pMap->nWID);
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 9ed5ee1d7a53..6f644fab1b9b 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoparagraph.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: tl $ $Date: 2002-09-26 07:17:29 $
+ * last change: $Author: cmc $ $Date: 2002-10-16 09:19:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -652,8 +652,6 @@ uno::Any SwXParagraph::getPropertyDefault(const OUString& rPropertyName)
aPropSet.getPropertyMap(), rPropertyName);
if(pMap)
{
- if ( pMap->nFlags & PropertyAttribute::READONLY)
- throw RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only:" ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if(pMap->nWID < RES_FRMATR_END)
{
const SfxPoolItem& rDefItem =
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 9e2d049ce5c7..fc3727d9e1b2 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unosect.cxx,v $
*
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: tl $ $Date: 2002-09-24 14:40:51 $
+ * last change: $Author: cmc $ $Date: 2002-10-16 09:19:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1328,8 +1328,6 @@ Any SwXTextSection::getPropertyDefault( const OUString& rPropertyName )
aPropSet.getPropertyMap(), rPropertyName);
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- if ( pMap->nFlags & PropertyAttribute::READONLY)
- throw RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
switch(pMap->nWID)
{
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index c1375425e45d..e93e0d29a15d 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unostyle.cxx,v $
*
- * $Revision: 1.49 $
+ * $Revision: 1.50 $
*
- * last change: $Author: tl $ $Date: 2002-09-26 07:18:02 $
+ * last change: $Author: cmc $ $Date: 2002-10-16 09:19:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2851,8 +2851,6 @@ Sequence< Any > SAL_CALL SwXStyle::getPropertyDefaults( const Sequence< OUString
if ( !pMap )
throw UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
- if ( pMap->nFlags & PropertyAttribute::READONLY )
- throw RuntimeException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
if( pParentSet )
pRet[i] = aSwMapProvider.GetPropertySet(nPropSetId).getPropertyValue(pNames[i], *pParentSet);