mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Directly use OUString

Browse Source 
Change-Id: I9029bab2b0ab98a2d78166145a35792e298c9115
This commit is contained in:
Stephan Bergmann
2013-11-01 14:56:48 +01:00
parent 1e5367fc87
commit dc704d724f
2 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
xmloff/source/draw/ximpshap.cxx
View File

@@ -475,7 +475,7 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
} }
void SdXMLShapeContext::AddShape(const char* pServiceName ) void SdXMLShapeContext::AddShape(OUString const & serviceName)
{ {
uno::Reference< lang::XMultiServiceFactory > xServiceFact(GetImport().GetModel(), uno::UNO_QUERY); uno::Reference< lang::XMultiServiceFactory > xServiceFact(GetImport().GetModel(), uno::UNO_QUERY);
if(xServiceFact.is()) if(xServiceFact.is())
@@ -489,14 +489,14 @@ void SdXMLShapeContext::AddShape(const char* pServiceName )
objects after the import into com.sun.star.drawing.GraphicObjectShape. objects after the import into com.sun.star.drawing.GraphicObjectShape.
*/ */
uno::Reference< drawing::XShape > xShape; uno::Reference< drawing::XShape > xShape;
if ( OUString::createFromAscii(pServiceName).compareToAscii( "com.sun.star.drawing.OLE2Shape" ) == 0 && if ( serviceName == "com.sun.star.drawing.OLE2Shape" &&
uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() ) uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() )
{ {
xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance("com.sun.star.drawing.temporaryForXMLImportOLE2Shape"), uno::UNO_QUERY); xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance("com.sun.star.drawing.temporaryForXMLImportOLE2Shape"), uno::UNO_QUERY);
} }
else else
{ {
xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString::createFromAscii(pServiceName)), uno::UNO_QUERY); xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(serviceName), uno::UNO_QUERY);
} }
if( xShape.is() ) if( xShape.is() )
AddShape( xShape ); AddShape( xShape );
@@ -504,7 +504,7 @@ void SdXMLShapeContext::AddShape(const char* pServiceName )
catch(const uno::Exception& e) catch(const uno::Exception& e)
{ {
uno::Sequence<OUString> aSeq( 1 ); uno::Sequence<OUString> aSeq( 1 );
aSeq[0] = OUString::createFromAscii(pServiceName); aSeq[0] = serviceName;
GetImport().SetError( XMLERROR_FLAG_ERROR | XMLERROR_API, GetImport().SetError( XMLERROR_FLAG_ERROR | XMLERROR_API,
aSeq, e.Message, NULL ); aSeq, e.Message, NULL );
} }
@@ -1407,33 +1407,33 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
} }
// create shape // create shape
const char* pService; OUString service;
if(aPolyPolygon.areControlPointsUsed()) if(aPolyPolygon.areControlPointsUsed())
{ {
if(aPolyPolygon.isClosed()) if(aPolyPolygon.isClosed())
{ {
pService = "com.sun.star.drawing.ClosedBezierShape"; service = "com.sun.star.drawing.ClosedBezierShape";
} }
else else
{ {
pService = "com.sun.star.drawing.OpenBezierShape"; service = "com.sun.star.drawing.OpenBezierShape";
} }
} }
else else
{ {
if(aPolyPolygon.isClosed()) if(aPolyPolygon.isClosed())
{ {
pService = "com.sun.star.drawing.PolyPolygonShape"; service = "com.sun.star.drawing.PolyPolygonShape";
} }
else else
{ {
pService = "com.sun.star.drawing.PolyLineShape"; service = "com.sun.star.drawing.PolyLineShape";
} }
} }
// Add, set Style and properties from base shape // Add, set Style and properties from base shape
AddShape(pService); AddShape(service);
// #89344# test for mxShape.is() and not for mxShapes.is() to support // #89344# test for mxShape.is() and not for mxShapes.is() to support
// shape import helper classes WITHOUT XShapes (member mxShapes). This // shape import helper classes WITHOUT XShapes (member mxShapes). This
@@ -1525,7 +1525,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
sal_Bool bIsPresShape = sal_False; sal_Bool bIsPresShape = sal_False;
bool bClearText = false; bool bClearText = false;
const char *pService = NULL; OUString service;
if( isPresentationShape() ) if( isPresentationShape() )
{ {
@@ -1535,59 +1535,59 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
if( IsXMLToken( maPresentationClass, XML_PRESENTATION_SUBTITLE )) if( IsXMLToken( maPresentationClass, XML_PRESENTATION_SUBTITLE ))
{ {
// XmlShapeTypePresSubtitleShape // XmlShapeTypePresSubtitleShape
pService = "com.sun.star.presentation.SubtitleShape"; service = "com.sun.star.presentation.SubtitleShape";
} }
else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OUTLINE ) ) else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OUTLINE ) )
{ {
// XmlShapeTypePresOutlinerShape // XmlShapeTypePresOutlinerShape
pService = "com.sun.star.presentation.OutlinerShape"; service = "com.sun.star.presentation.OutlinerShape";
} }
else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_NOTES ) ) else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_NOTES ) )
{ {
// XmlShapeTypePresNotesShape // XmlShapeTypePresNotesShape
pService = "com.sun.star.presentation.NotesShape"; service = "com.sun.star.presentation.NotesShape";
} }
else if( IsXMLToken( maPresentationClass, XML_HEADER ) ) else if( IsXMLToken( maPresentationClass, XML_HEADER ) )
{ {
// XmlShapeTypePresHeaderShape // XmlShapeTypePresHeaderShape
pService = "com.sun.star.presentation.HeaderShape"; service = "com.sun.star.presentation.HeaderShape";
bClearText = true; bClearText = true;
} }
else if( IsXMLToken( maPresentationClass, XML_FOOTER ) ) else if( IsXMLToken( maPresentationClass, XML_FOOTER ) )
{ {
// XmlShapeTypePresFooterShape // XmlShapeTypePresFooterShape
pService = "com.sun.star.presentation.FooterShape"; service = "com.sun.star.presentation.FooterShape";
bClearText = true; bClearText = true;
} }
else if( IsXMLToken( maPresentationClass, XML_PAGE_NUMBER ) ) else if( IsXMLToken( maPresentationClass, XML_PAGE_NUMBER ) )
{ {
// XmlShapeTypePresSlideNumberShape // XmlShapeTypePresSlideNumberShape
pService = "com.sun.star.presentation.SlideNumberShape"; service = "com.sun.star.presentation.SlideNumberShape";
bClearText = true; bClearText = true;
} }
else if( IsXMLToken( maPresentationClass, XML_DATE_TIME ) ) else if( IsXMLToken( maPresentationClass, XML_DATE_TIME ) )
{ {
// XmlShapeTypePresDateTimeShape // XmlShapeTypePresDateTimeShape
pService = "com.sun.star.presentation.DateTimeShape"; service = "com.sun.star.presentation.DateTimeShape";
bClearText = true; bClearText = true;
} }
else // IsXMLToken( maPresentationClass, XML_PRESENTATION_TITLE ) ) else // IsXMLToken( maPresentationClass, XML_PRESENTATION_TITLE ) )
{ {
// XmlShapeTypePresTitleTextShape // XmlShapeTypePresTitleTextShape
pService = "com.sun.star.presentation.TitleTextShape"; service = "com.sun.star.presentation.TitleTextShape";
} }
bIsPresShape = sal_True; bIsPresShape = sal_True;
} }
} }
if( NULL == pService ) if( service.isEmpty() )
{ {
// normal text shape // normal text shape
pService = "com.sun.star.drawing.TextShape"; service = "com.sun.star.drawing.TextShape";
} }
// Add, set Style and properties from base shape // Add, set Style and properties from base shape
AddShape(pService); AddShape(service);
if( mxShape.is() ) if( mxShape.is() )
{ {
@@ -2299,18 +2299,18 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const
void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& )
{ {
// create graphic object shape // create graphic object shape
const char *pService; OUString service;
if( IsXMLToken( maPresentationClass, XML_GRAPHIC ) && GetImport().GetShapeImport()->IsPresentationShapesSupported() ) if( IsXMLToken( maPresentationClass, XML_GRAPHIC ) && GetImport().GetShapeImport()->IsPresentationShapesSupported() )
{ {
pService = "com.sun.star.presentation.GraphicObjectShape"; service = "com.sun.star.presentation.GraphicObjectShape";
} }
else else
{ {
pService = "com.sun.star.drawing.GraphicObjectShape"; service = "com.sun.star.drawing.GraphicObjectShape";
} }
AddShape( pService ); AddShape(service);
if(mxShape.is()) if(mxShape.is())
{ {
@@ -2457,7 +2457,10 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
{ {
const sal_Bool bIsPresentation = isPresentationShape(); const sal_Bool bIsPresentation = isPresentationShape();
AddShape( bIsPresentation ? "com.sun.star.presentation.ChartShape" : "com.sun.star.drawing.OLE2Shape" ); AddShape(
bIsPresentation
? OUString("com.sun.star.presentation.ChartShape")
: OUString("com.sun.star.drawing.OLE2Shape"));
if(mxShape.is()) if(mxShape.is())
{ {
@@ -2567,7 +2570,7 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen
if( !(GetImport().getImportFlags() & IMPORT_EMBEDDED) && !mbIsPlaceholder && ImpIsEmptyURL(maHref) ) if( !(GetImport().getImportFlags() & IMPORT_EMBEDDED) && !mbIsPlaceholder && ImpIsEmptyURL(maHref) )
return; return;
const char* pService = "com.sun.star.drawing.OLE2Shape"; OUString service("com.sun.star.drawing.OLE2Shape");
sal_Bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); sal_Bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported();
@@ -2575,19 +2578,19 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen
{ {
if( IsXMLToken( maPresentationClass, XML_PRESENTATION_CHART ) ) if( IsXMLToken( maPresentationClass, XML_PRESENTATION_CHART ) )
{ {
pService = "com.sun.star.presentation.ChartShape"; service = "com.sun.star.presentation.ChartShape";
} }
else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) ) else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) )
{ {
pService = "com.sun.star.presentation.CalcShape"; service = "com.sun.star.presentation.CalcShape";
} }
else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OBJECT ) ) else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OBJECT ) )
{ {
pService = "com.sun.star.presentation.OLE2Shape"; service = "com.sun.star.presentation.OLE2Shape";
} }
} }
AddShape( pService ); AddShape(service);
if( mxShape.is() ) if( mxShape.is() )
{ {
@@ -2769,8 +2772,7 @@ SdXMLAppletShapeContext::~SdXMLAppletShapeContext()
void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) void SdXMLAppletShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& )
{ {
const char* pService = "com.sun.star.drawing.AppletShape"; AddShape("com.sun.star.drawing.AppletShape");
AddShape( pService );
if( mxShape.is() ) if( mxShape.is() )
{ {
@@ -2948,27 +2950,27 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen
} }
} }
const char* pService; OUString service;
sal_Bool bIsPresShape = sal_False; sal_Bool bIsPresShape = sal_False;
if( mbMedia ) if( mbMedia )
{ {
pService = "com.sun.star.drawing.MediaShape"; service = "com.sun.star.drawing.MediaShape";
bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported();
if( bIsPresShape ) if( bIsPresShape )
{ {
if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OBJECT ) ) if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OBJECT ) )
{ {
pService = "com.sun.star.presentation.MediaShape"; service = "com.sun.star.presentation.MediaShape";
} }
} }
} }
else else
pService = "com.sun.star.drawing.PluginShape"; service = "com.sun.star.drawing.PluginShape";
AddShape( pService ); AddShape(service);
if( mxShape.is() ) if( mxShape.is() )
{ {
@@ -3205,8 +3207,7 @@ SdXMLFloatingFrameShapeContext::~SdXMLFloatingFrameShapeContext()
void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& )
{ {
const char* pService = "com.sun.star.drawing.FrameShape"; AddShape("com.sun.star.drawing.FrameShape");
AddShape( pService );
if( mxShape.is() ) if( mxShape.is() )
{ {
@@ -3764,18 +3765,18 @@ SdXMLTableShapeContext::~SdXMLTableShapeContext()
void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
{ {
const char* pService = "com.sun.star.drawing.TableShape"; OUString service("com.sun.star.drawing.TableShape");
sal_Bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); sal_Bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported();
if( bIsPresShape ) if( bIsPresShape )
{ {
if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) ) if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) )
{ {
pService = "com.sun.star.presentation.TableShape"; service = "com.sun.star.presentation.TableShape";
} }
} }
AddShape( pService ); AddShape(service);
if( mxShape.is() ) if( mxShape.is() )
{ {

2
xmloff/source/draw/ximpshap.hxx
View File

@@ -86,7 +86,7 @@ protected:
void SetThumbnail(); void SetThumbnail();
void AddShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape); void AddShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape);
void AddShape(const char* pServiceName ); void AddShape(OUString const & serviceName);
void SetTransformation(); void SetTransformation();
SvXMLImport& GetImport() { return SvXMLImportContext::GetImport(); } SvXMLImport& GetImport() { return SvXMLImportContext::GetImport(); }