summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx81
-rw-r--r--svx/source/unodraw/unoipset.cxx7
-rw-r--r--svx/source/unodraw/unoshape.cxx12
3 files changed, 41 insertions, 59 deletions
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index bfbff34f1ea3..972740b41204 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: UnoNamespaceMap.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: cl $ $Date: 2001-10-12 16:08:30 $
+ * last change: $Author: cl $ $Date: 2001-10-16 09:19:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -117,10 +117,10 @@ namespace svx
{
private:
sal_uInt16* mpWhichIds;
- SfxItemPool* mpPool1;
- SfxItemPool* mpPool2;
+ SfxItemPool* mpPool;
+
public:
- NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool1, SfxItemPool* pPool2 );
+ NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool );
virtual ~NamespaceMap();
// XNameAccess
@@ -141,7 +141,13 @@ namespace svx
Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool1, SfxItemPool* pPool2 )
throw( Exception )
{
- return (XWeak*)new NamespaceMap( pWhichIds, pPool1, pPool2 );
+ return (XWeak*)new NamespaceMap( pWhichIds, pPool1 );
+ }
+
+ Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool )
+ throw( Exception )
+ {
+ return (XWeak*)new NamespaceMap( pWhichIds, pPool );
}
Sequence< OUString > SAL_CALL NamespaceMap_getSupportedServiceNames()
@@ -163,12 +169,8 @@ namespace svx
class NamespaceIteratorImpl
{
private:
- SfxItemPool* mpPool1;
- SfxItemPool* mpPool2;
+ SfxItemPool* mpPool;
-
- SfxItemPool* mpCurrentPool;
- sal_uInt16* mpWhichIds;
sal_uInt16* mpWhichId;
sal_uInt16 mnItemCount;
@@ -177,10 +179,9 @@ namespace svx
const SvXMLAttrContainerItem* mpCurrentAttr;
sal_uInt16 mnCurrentAttr;
- void startPool( SfxItemPool* pPool );
public:
- NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool1, SfxItemPool* pPool2 );
+ NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool );
sal_Bool next( OUString& rPrefix, OUString& rURL );
};
@@ -190,27 +191,16 @@ using namespace ::svx;
// -------------
-NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool1, SfxItemPool* pPool2 )
+NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool )
{
- mpPool1 = pPool1;
- mpPool2 = pPool2;
-
+ mpPool = pPool;
mpCurrentAttr = NULL;
mnCurrentAttr = 0;
- mpWhichIds = pWhichIds;
-
- startPool( pPool1 );
-}
-
-void NamespaceIteratorImpl::startPool( SfxItemPool* pPool )
-{
- mpCurrentPool = pPool;
-
- mpWhichId = mpWhichIds;
+ mpWhichId = pWhichIds;
mnItem = 0;
- mnItemCount = (mpWhichId && (0 != *mpWhichId) && pPool) ? pPool->GetItemCount( *mpWhichId ) : 0;
+ mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount( *mpWhichId ) : 0;
}
sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
@@ -230,7 +220,7 @@ sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
const SfxPoolItem* pItem;
// look for the next available item in the current pool
- while( (mnItem < mnItemCount) && ( NULL == (pItem = mpCurrentPool->GetItem( *mpWhichId, mnItem ) ) ) )
+ while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem( *mpWhichId, mnItem ) ) ) )
mnItem++;
// are we finished with the current whichid?
@@ -239,27 +229,14 @@ sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
mpWhichId++;
// are we finished with the current pool?
- if( 0 == *mpWhichId )
- {
- // we already finished both pools
- if( mpCurrentPool == mpPool2 )
- return sal_False;
-
- // switch to the second pool, if there is one
- mpCurrentPool = mpPool2;
- if( NULL == mpCurrentPool )
- return sal_False;
-
- // start with second pool
- startPool( mpPool2 );
- }
- else
+ if( 0 != *mpWhichId )
{
mnItem = 0;
- mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpCurrentPool) ? mpCurrentPool->GetItemCount( *mpWhichId ) : 0;
+ mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount( *mpWhichId ) : 0;
+ return next( rPrefix, rURL );
}
- return next( rPrefix, rURL );
+ pItem = NULL;
}
if( pItem )
@@ -281,8 +258,8 @@ sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
// -------------
-NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool1, SfxItemPool* pPool2 )
-: mpWhichIds( pWhichIds ), mpPool1( pPool1 ), mpPool2( pPool2 )
+NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool )
+: mpWhichIds( pWhichIds ), mpPool( pPool )
{
}
@@ -293,7 +270,7 @@ NamespaceMap::~NamespaceMap()
// XNameAccess
Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
{
- NamespaceIteratorImpl aIter( mpWhichIds, mpPool1, mpPool2 );
+ NamespaceIteratorImpl aIter( mpWhichIds, mpPool );
OUString aPrefix;
OUString aURL;
@@ -314,7 +291,7 @@ Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchEleme
Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeException)
{
- NamespaceIteratorImpl aIter( mpWhichIds, mpPool1, mpPool2 );
+ NamespaceIteratorImpl aIter( mpWhichIds, mpPool );
OUString aPrefix;
OUString aURL;
@@ -340,7 +317,7 @@ Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeExce
sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (RuntimeException)
{
- NamespaceIteratorImpl aIter( mpWhichIds, mpPool1, mpPool2 );
+ NamespaceIteratorImpl aIter( mpWhichIds, mpPool );
OUString aPrefix;
OUString aURL;
@@ -364,7 +341,7 @@ Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException)
sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException)
{
- NamespaceIteratorImpl aIter( mpWhichIds, mpPool1, mpPool2 );
+ NamespaceIteratorImpl aIter( mpWhichIds, mpPool );
OUString aPrefix;
OUString aURL;
diff --git a/svx/source/unodraw/unoipset.cxx b/svx/source/unodraw/unoipset.cxx
index d1b7ce9bee13..173caad7910d 100644
--- a/svx/source/unodraw/unoipset.cxx
+++ b/svx/source/unodraw/unoipset.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoipset.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: cl $ $Date: 2001-08-08 15:47:14 $
+ * last change: $Author: cl $ $Date: 2001-10-16 09:22:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -230,7 +230,8 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertyMap* pMap, c
// item holen
const SfxPoolItem* pItem = 0;
SfxItemPool* pPool = rSet.GetPool();
- SfxItemState eState = rSet.GetItemState( pMap->nWID, sal_True, &pItem );
+
+ SfxItemState eState = rSet.GetItemState( pMap->nWID, pMap->nWID != SDRATTR_XMLATTRIBUTES, &pItem );
if( NULL == pItem && pPool )
{
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 848bbb2b415d..68a06f863e11 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoshape.cxx,v $
*
- * $Revision: 1.72 $
+ * $Revision: 1.73 $
*
- * last change: $Author: ka $ $Date: 2001-09-13 09:32:10 $
+ * last change: $Author: cl $ $Date: 2001-10-16 09:21:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -225,6 +225,8 @@ const SfxItemPropertyMap* ImplGetSvxUnoOutlinerTextCursorPropertyMap()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
+ {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {MAP_CHAR_LEN("UserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{0,0}
};
@@ -239,8 +241,10 @@ const SfxItemPropertyMap* ImplGetSvxTextPortionPropertyMap()
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },\
- {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, \
+ {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {MAP_CHAR_LEN("UserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{0,0}
};
generated by cgit (git 2.34.1) at 2024-07-20 22:34:28 +0000