summaryrefslogtreecommitdiff
path: root/svx/source/unodraw
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-05-02 13:22:17 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-18 15:35:15 +0100
commit6ed60d6a9314341bda0afbea7ed6b106f562393d (patch)
tree5ea1decacc5aec581540970cd137334641c840b5 /svx/source/unodraw
parent5ba49392543bae1f6477c65f1887881b48a3143e (diff)
Related: #i122120# Ensured Append/Modify methods in LB implementations...
always add a UI graphic preview, corrected diag mirror in bitmap pattern (cherry picked from commit 36a8574012525fa837df6dfd1839fa65b5a2bc70) Conflicts: cui/source/tabpages/tpbitmap.cxx cui/source/tabpages/tpcolor.cxx cui/source/tabpages/tpgradnt.cxx cui/source/tabpages/tplnedef.cxx cui/source/tabpages/tplneend.cxx svx/inc/svx/dlgctrl.hxx svx/inc/svx/xtable.hxx svx/source/dialog/dlgctrl.cxx svx/source/xoutdev/xtabbtmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/source/xoutdev/xtabdash.cxx svx/source/xoutdev/xtabgrdt.cxx svx/source/xoutdev/xtabhtch.cxx svx/source/xoutdev/xtable.cxx svx/source/xoutdev/xtablend.cxx Change-Id: Iff0744061b76d8c608e285f81bcc8e76edeb6a69
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx2
-rw-r--r--svx/source/unodraw/unoctabl.cxx8
-rw-r--r--svx/source/unodraw/unoshape.cxx22
3 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index c9b9603fae67..ededdfd1eff3 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -87,7 +87,7 @@ SvxUnoXPropertyTable::~SvxUnoXPropertyTable() throw()
XPropertyEntry* SvxUnoXPropertyTable::get( long index ) const
{
if( mpList )
- return mpList->Get( index, 0 );
+ return mpList->Get(index);
else
return NULL;
}
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 605f09264b2e..82baea9440b2 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -135,7 +135,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::
void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- long nIndex = pList.is() ? pList->Get( Name ) : -1;
+ long nIndex = pList.is() ? pList->GetIndex( Name ) : -1;
if( nIndex == -1 )
throw container::NoSuchElementException();
@@ -150,7 +150,7 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno:
if( !(aElement >>= nColor) )
throw lang::IllegalArgumentException();
- long nIndex = pList.is() ? pList->Get( aName ) : -1;
+ long nIndex = pList.is() ? pList->GetIndex( aName ) : -1;
if( nIndex == -1 )
throw container::NoSuchElementException();
@@ -162,7 +162,7 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno:
uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- long nIndex = pList.is() ? pList->Get( aName ) : -1;
+ long nIndex = pList.is() ? pList->GetIndex( aName ) : -1;
if( nIndex == -1 )
throw container::NoSuchElementException();
@@ -190,7 +190,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames()
sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName )
throw( uno::RuntimeException )
{
- long nIndex = pList.is() ? pList->Get( aName ) : -1;
+ long nIndex = pList.is() ? pList->GetIndex( aName ) : -1;
return nIndex != -1;
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index c5199e601049..dffbd73ea403 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1497,9 +1497,9 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
if( !pBitmapList.is() )
return sal_False;
- long nPos = pBitmapList->Get(aStrName);
+ long nPos = pBitmapList->GetIndex(aStrName);
if( nPos == -1 )
- return sal_False;
+ return false;
XBitmapEntry* pEntry = pBitmapList->GetBitmap( nPos );
XFillBitmapItem aBmpItem;
@@ -1516,9 +1516,9 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
if( !pGradientList.is() )
return sal_False;
- long nPos = pGradientList->Get(aStrName);
+ long nPos = pGradientList->GetIndex(aStrName);
if( nPos == -1 )
- return sal_False;
+ return false;
XGradientEntry* pEntry = pGradientList->GetGradient( nPos );
XFillGradientItem aGrdItem;
@@ -1535,9 +1535,9 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
if( !pHatchList.is() )
return sal_False;
- long nPos = pHatchList->Get(aStrName);
+ long nPos = pHatchList->GetIndex(aStrName);
if( nPos == -1 )
- return sal_False;
+ return false;
XHatchEntry* pEntry = pHatchList->GetHatch( nPos );
XFillHatchItem aHatchItem;
@@ -1555,9 +1555,9 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
if( !pLineEndList.is() )
return sal_False;
- long nPos = pLineEndList->Get(aStrName);
+ long nPos = pLineEndList->GetIndex(aStrName);
if( nPos == -1 )
- return sal_False;
+ return false;
XLineEndEntry* pEntry = pLineEndList->GetLineEnd( nPos );
if( XATTR_LINEEND == nWID )
@@ -1584,11 +1584,11 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
XDashListRef pDashList = pModel->GetDashList();
if( !pDashList.is() )
- return sal_False;
+ return false;
- long nPos = pDashList->Get(aStrName);
+ long nPos = pDashList->GetIndex(aStrName);
if( nPos == -1 )
- return sal_False;
+ return false;
XDashEntry* pEntry = pDashList->GetDash( nPos );
XLineDashItem aDashItem;