diff options
Diffstat (limited to 'svx/source/xoutdev')
-rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 8 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 0a16759726e8..a24689b2478d 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -33,10 +33,10 @@ #include <sax/tools/converter.hxx> #include <boost/scoped_array.hpp> -#define FORMAT_BMP OUString("bmp") -#define FORMAT_GIF OUString("gif") -#define FORMAT_JPG OUString("jpg") -#define FORMAT_PNG OUString("png") +#define FORMAT_BMP "bmp" +#define FORMAT_GIF "gif" +#define FORMAT_JPG "jpg" +#define FORMAT_PNG "png" GraphicFilter* XOutBitmap::pGrfFilter = NULL; diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 06e44c472bc6..ae7e2406256d 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -156,7 +156,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u if( !pCompareValueFunc( pItem, pCheckItem ) ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; @@ -1392,7 +1392,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( pItem->GetLineStartValue() != pLineStartItem->GetLineStartValue() ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; @@ -1414,7 +1414,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( pItem->GetLineEndValue() != pLineStartItem->GetLineStartValue() ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; @@ -1438,7 +1438,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( pItem->GetLineStartValue() != pLineStartItem->GetLineStartValue() ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; @@ -1459,7 +1459,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( pItem->GetLineEndValue() != pLineStartItem->GetLineStartValue() ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; @@ -1675,7 +1675,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( pItem->GetLineStartValue() != pLineEndItem->GetLineEndValue() ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; @@ -1697,7 +1697,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( pItem->GetLineEndValue() != pLineEndItem->GetLineEndValue() ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; @@ -1721,7 +1721,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( pItem->GetLineStartValue() != pLineEndItem->GetLineEndValue() ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; @@ -1742,7 +1742,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( pItem->GetLineEndValue() != pLineEndItem->GetLineEndValue() ) { // same name but different value, we need a new name for this item - aUniqueName = ""; + aUniqueName.clear(); bForceNew = true; } break; |