summaryrefslogtreecommitdiff
path: root/framework/source/xml
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-24 16:06:02 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-24 16:06:02 +0000
commitabd9d69da41fbd66e875b0fddede2ed450a4a9eb (patch)
treea45681da96851193c377aa43afd69ef3dfadce61 /framework/source/xml
parentfacd7800c8b3c9f5a8d7c0c465d7f601a1489012 (diff)
INTEGRATION: CWS obo30 (1.9.38); FILE MERGED
2008/06/23 07:52:03 obo 1.9.38.4: #i90100# fix after resync 2008/06/20 10:00:06 obo 1.9.38.3: RESYNC: (1.9-1.10); FILE MERGED 2008/06/06 06:38:58 obo 1.9.38.2: #i90100# EOL missing 2008/05/30 08:31:11 obo 1.9.38.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'framework/source/xml')
-rw-r--r--framework/source/xml/imagesdocumenthandler.cxx197
1 files changed, 100 insertions, 97 deletions
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 0fba64c18f..b4906785bc 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -1,13 +1,13 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: imagesdocumenthandler.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
* This file is part of OpenOffice.org.
*
@@ -62,7 +62,6 @@
// namespace
//_________________________________________________________________________________________________________________
-using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
@@ -143,13 +142,13 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI
m_aImageList.pImageList = NULL;
m_aImageList.pExternalImageList = NULL;
- m_nHashMaskModeBitmap = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )).hashCode();
- m_nHashMaskModeColor = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )).hashCode();
+ m_nHashMaskModeBitmap = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )).hashCode();
+ m_nHashMaskModeColor = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )).hashCode();
// create hash map to speed up lookup
for ( int i = 0; i < (int)IMG_XML_ENTRY_COUNT; i++ )
{
- OUStringBuffer temp( 20 );
+ ::rtl::OUStringBuffer temp( 20 );
if ( ImagesEntries[i].nNamespace == IMG_NS_IMAGE )
temp.appendAscii( XMLNS_IMAGE );
@@ -202,14 +201,14 @@ throw( SAXException, RuntimeException )
if (( m_bImageContainerStartFound && !m_bImageContainerEndFound ) ||
( !m_bImageContainerStartFound && m_bImageContainerEndFound ) )
{
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'image:imagecontainer' found!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No matching start or end element 'image:imagecontainer' found!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
}
void SAL_CALL OReadImagesDocumentHandler::startElement(
- const OUString& aName, const Reference< XAttributeList > &xAttribs )
+ const ::rtl::OUString& aName, const Reference< XAttributeList > &xAttribs )
throw( SAXException, RuntimeException )
{
ResetableGuard aGuard( m_aLock );
@@ -224,8 +223,8 @@ throw( SAXException, RuntimeException )
// image:imagecontainer element (container element for all further image elements)
if ( m_bImageContainerStartFound )
{
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:imagecontainer' cannot be embeded into 'image:imagecontainer'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:imagecontainer' cannot be embeded into 'image:imagecontainer'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -237,15 +236,15 @@ throw( SAXException, RuntimeException )
{
if ( !m_bImageContainerStartFound )
{
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' must be embeded into element 'image:imagecontainer'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' must be embeded into element 'image:imagecontainer'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
if ( m_bImagesStartFound )
{
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' cannot be embeded into 'image:images'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' cannot be embeded into 'image:images'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -270,7 +269,7 @@ throw( SAXException, RuntimeException )
case IMG_ATTRIBUTE_MASKCOLOR:
{
- OUString aColor = xAttribs->getValueByIndex( n );
+ ::rtl::OUString aColor = xAttribs->getValueByIndex( n );
if ( aColor.getLength() > 0 )
{
@@ -303,8 +302,8 @@ throw( SAXException, RuntimeException )
delete m_pImages;
m_pImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute image:maskmode must be 'maskcolor' or 'maskbitmap'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Attribute image:maskmode must be 'maskcolor' or 'maskbitmap'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
}
@@ -323,7 +322,7 @@ throw( SAXException, RuntimeException )
break;
default:
- break;
+ break;
}
}
} // for
@@ -333,8 +332,8 @@ throw( SAXException, RuntimeException )
delete m_pImages;
m_pImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute xlink:href must have a value!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute xlink:href must have a value!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
}
@@ -348,8 +347,8 @@ throw( SAXException, RuntimeException )
delete m_pImages;
m_pImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:entry' must be embeded into element 'image:images'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:entry' must be embeded into element 'image:images'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -383,7 +382,7 @@ throw( SAXException, RuntimeException )
break;
default:
- break;
+ break;
}
}
}
@@ -395,8 +394,8 @@ throw( SAXException, RuntimeException )
delete m_pImages;
m_pImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:bitmap-index' must have a value >= 0!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:bitmap-index' must have a value >= 0!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -407,8 +406,8 @@ throw( SAXException, RuntimeException )
delete m_pImages;
m_pImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:command' must have a value!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:command' must have a value!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -425,8 +424,8 @@ throw( SAXException, RuntimeException )
delete m_pImages;
m_pImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' must be embeded into element 'image:imagecontainer'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' must be embeded into element 'image:imagecontainer'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -436,8 +435,8 @@ throw( SAXException, RuntimeException )
delete m_pImages;
m_pImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' cannot be embeded into 'image:externalimages'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' cannot be embeded into 'image:externalimages'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -456,8 +455,8 @@ throw( SAXException, RuntimeException )
m_pImages = NULL;
m_pExternalImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' must be embeded into 'image:externalimages'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' must be embeded into 'image:externalimages'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -468,8 +467,8 @@ throw( SAXException, RuntimeException )
m_pImages = NULL;
m_pExternalImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' cannot be embeded into 'image:externalentry'!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' cannot be embeded into 'image:externalentry'!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -498,7 +497,7 @@ throw( SAXException, RuntimeException )
break;
default:
- break;
+ break;
}
}
}
@@ -512,8 +511,8 @@ throw( SAXException, RuntimeException )
m_pImages = NULL;
m_pExternalImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:command' must have a value!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'image:command' must have a value!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -526,8 +525,8 @@ throw( SAXException, RuntimeException )
m_pImages = NULL;
m_pExternalImages = NULL;
- OUString aErrorMessage = getErrorLineString();
- aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'xlink:href' must have a value!" ));
+ ::rtl::OUString aErrorMessage = getErrorLineString();
+ aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Required attribute 'xlink:href' must have a value!" ));
throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
}
@@ -537,12 +536,12 @@ throw( SAXException, RuntimeException )
break;
default:
- break;
+ break;
}
}
}
-void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName)
+void SAL_CALL OReadImagesDocumentHandler::endElement(const ::rtl::OUString& aName)
throw( SAXException, RuntimeException )
{
ResetableGuard aGuard( m_aLock );
@@ -601,18 +600,18 @@ throw( SAXException, RuntimeException )
}
}
-void SAL_CALL OReadImagesDocumentHandler::characters(const OUString&)
+void SAL_CALL OReadImagesDocumentHandler::characters(const ::rtl::OUString&)
throw( SAXException, RuntimeException )
{
}
-void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const OUString&)
+void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const ::rtl::OUString&)
throw( SAXException, RuntimeException )
{
}
void SAL_CALL OReadImagesDocumentHandler::processingInstruction(
- const OUString& /*aTarget*/, const OUString& /*aData*/ )
+ const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ )
throw( SAXException, RuntimeException )
{
}
@@ -635,10 +634,10 @@ throw( SAXException, RuntimeException )
if ( m_xLocator.is() )
{
snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast<long>( m_xLocator->getLineNumber() ));
- return OUString::createFromAscii( buffer );
+ return ::rtl::OUString::createFromAscii( buffer );
}
else
- return OUString();
+ return ::rtl::OUString();
}
@@ -655,11 +654,11 @@ OWriteImagesDocumentHandler::OWriteImagesDocumentHandler(
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
m_xEmptyList = Reference< XAttributeList >( (XAttributeList *) pList, UNO_QUERY );
- m_aAttributeType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA ));
- m_aXMLImageNS = OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE_PREFIX ));
- m_aXMLXlinkNS = OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX ));
- m_aAttributeXlinkType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE ));
- m_aAttributeValueSimple = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE_VALUE ));
+ m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA ));
+ m_aXMLImageNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE_PREFIX ));
+ m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK_PREFIX ));
+ m_aAttributeXlinkType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE ));
+ m_aAttributeValueSimple = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XLINK_TYPE_VALUE ));
}
OWriteImagesDocumentHandler::~OWriteImagesDocumentHandler()
@@ -677,23 +676,23 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw
Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY );
if ( xExtendedDocHandler.is() )
{
- xExtendedDocHandler->unknown( OUString( RTL_CONSTASCII_USTRINGPARAM( IMAGES_DOCTYPE )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ xExtendedDocHandler->unknown( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMAGES_DOCTYPE )) );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
}
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
- pList->AddAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_IMAGE )),
+ pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_IMAGE )),
m_aAttributeType,
- OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE )) );
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_IMAGE )) );
- pList->AddAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_XLINK )),
+ pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_XLINK )),
m_aAttributeType,
- OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )) );
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )) );
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGESCONTAINER )), pList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGESCONTAINER )), pList );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
if ( m_aImageListsItems.pImageList )
{
@@ -711,9 +710,9 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw
WriteExternalImageList( m_aImageListsItems.pExternalImageList );
}
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGESCONTAINER )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGESCONTAINER )) );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
m_xWriteDocumentHandler->endDocument();
}
@@ -732,53 +731,53 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
m_aAttributeType,
m_aAttributeValueSimple );
- pList->AddAttribute( m_aXMLXlinkNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF )),
+ pList->AddAttribute( m_aXMLXlinkNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF )),
m_aAttributeType,
pImageList->aURL );
if ( pImageList->nMaskMode == ImageMaskMode_Bitmap )
{
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE )),
m_aAttributeType,
- OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )) );
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_BITMAP )) );
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKURL )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKURL )),
m_aAttributeType,
pImageList->aMaskURL );
if ( pImageList->aHighContrastMaskURL.Len() > 0 )
{
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HIGHCONTRASTMASKURL )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HIGHCONTRASTMASKURL )),
m_aAttributeType,
pImageList->aHighContrastMaskURL );
}
}
else
{
- OUStringBuffer aColorStrBuffer( 8 );
+ ::rtl::OUStringBuffer aColorStrBuffer( 8 );
sal_Int64 nValue = pImageList->aMaskColor.GetRGBColor();
aColorStrBuffer.appendAscii( "#" );
- aColorStrBuffer.append( OUString::valueOf( nValue, 16 ));
+ aColorStrBuffer.append( ::rtl::OUString::valueOf( nValue, 16 ));
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKCOLOR )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKCOLOR )),
m_aAttributeType,
aColorStrBuffer.makeStringAndClear() );
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE )),
m_aAttributeType,
- OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )) );
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_MASKMODE_COLOR )) );
}
if ( pImageList->aHighContrastURL.Len() > 0 )
{
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HIGHCONTRASTURL )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HIGHCONTRASTURL )),
m_aAttributeType,
pImageList->aHighContrastURL );
}
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )), xList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )), xList );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList;
if ( pImageItemList )
@@ -787,8 +786,8 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
WriteImage( (*pImageItemList)[i] );
}
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )) );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
}
void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage ) throw
@@ -797,26 +796,26 @@ void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY );
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BITMAPINDEX )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_BITMAPINDEX )),
m_aAttributeType,
- OUString::valueOf( (sal_Int32)pImage->nIndex ) );
+ ::rtl::OUString::valueOf( (sal_Int32)pImage->nIndex ) );
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_COMMAND )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_COMMAND )),
m_aAttributeType,
pImage->aCommandURL );
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_ENTRY )), xList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_ENTRY )), xList );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_ENTRY )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_ENTRY )) );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
}
void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageItemListDescriptor* pExternalImageList ) throw
( SAXException, RuntimeException )
{
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )), m_xEmptyList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )), m_xEmptyList );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
for ( USHORT i = 0; i < pExternalImageList->Count(); i++ )
{
@@ -824,9 +823,9 @@ void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageIte
WriteExternalImage( pItem );
}
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALIMAGES )) );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
}
void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDescriptor* pExternalImage ) throw
@@ -842,23 +841,27 @@ void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDes
if ( pExternalImage->aURL.Len() > 0 )
{
- pList->AddAttribute( m_aXMLXlinkNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF )),
+ pList->AddAttribute( m_aXMLXlinkNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_HREF )),
m_aAttributeType,
pExternalImage->aURL );
}
if ( pExternalImage->aCommandURL.Len() > 0 )
{
- pList->AddAttribute( m_aXMLImageNS + OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_COMMAND )),
+ pList->AddAttribute( m_aXMLImageNS + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_COMMAND )),
m_aAttributeType,
pExternalImage->aCommandURL );
}
- m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALENTRY )), xList );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALENTRY )), xList );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALENTRY )) );
- m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
+ m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_EXTERNALENTRY )) );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
}
} // namespace framework
+
+
+
+