diff options
Diffstat (limited to 'drawinglayer/source')
16 files changed, 146 insertions, 146 deletions
diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx index 658d37bc20a6..f2ef2d3e5981 100644 --- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx +++ b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx @@ -39,8 +39,8 @@ namespace drawinglayer { namespace unorenderer { - extern uno::Sequence< rtl::OUString > SAL_CALL XPrimitive2DRenderer_getSupportedServiceNames(); - extern rtl::OUString SAL_CALL XPrimitive2DRenderer_getImplementationName(); + extern uno::Sequence< OUString > SAL_CALL XPrimitive2DRenderer_getSupportedServiceNames(); + extern OUString SAL_CALL XPrimitive2DRenderer_getImplementationName(); extern uno::Reference< uno::XInterface > SAL_CALL XPrimitive2DRenderer_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ); } // end of namespace unorenderer } // end of namespace drawinglayer diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index 3cb4a3113ff9..5568f8beb710 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -63,9 +63,9 @@ namespace drawinglayer ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw(uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const rtl::OUString&) throw(uno::RuntimeException); - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException); }; } // end of namespace unorenderer } // end of namespace drawinglayer @@ -77,17 +77,17 @@ namespace drawinglayer { namespace unorenderer { - uno::Sequence< rtl::OUString > XPrimitive2DRenderer_getSupportedServiceNames() + uno::Sequence< OUString > XPrimitive2DRenderer_getSupportedServiceNames() { - static rtl::OUString aServiceName("com.sun.star.graphic.Primitive2DTools" ); - static uno::Sequence< rtl::OUString > aServiceNames( &aServiceName, 1 ); + static OUString aServiceName("com.sun.star.graphic.Primitive2DTools" ); + static uno::Sequence< OUString > aServiceNames( &aServiceName, 1 ); return( aServiceNames ); } - rtl::OUString XPrimitive2DRenderer_getImplementationName() + OUString XPrimitive2DRenderer_getImplementationName() { - return rtl::OUString( "drawinglayer::unorenderer::XPrimitive2DRenderer" ); + return OUString( "drawinglayer::unorenderer::XPrimitive2DRenderer" ); } uno::Reference< uno::XInterface > SAL_CALL XPrimitive2DRenderer_createInstance(const uno::Reference< lang::XMultiServiceFactory >&) @@ -186,14 +186,14 @@ namespace drawinglayer return XBitmap; } - rtl::OUString SAL_CALL XPrimitive2DRenderer::getImplementationName() throw(uno::RuntimeException) + OUString SAL_CALL XPrimitive2DRenderer::getImplementationName() throw(uno::RuntimeException) { return(XPrimitive2DRenderer_getImplementationName()); } - sal_Bool SAL_CALL XPrimitive2DRenderer::supportsService(const rtl::OUString& rServiceName) throw(uno::RuntimeException) + sal_Bool SAL_CALL XPrimitive2DRenderer::supportsService(const OUString& rServiceName) throw(uno::RuntimeException) { - const uno::Sequence< rtl::OUString > aServices(XPrimitive2DRenderer_getSupportedServiceNames()); + const uno::Sequence< OUString > aServices(XPrimitive2DRenderer_getSupportedServiceNames()); for(sal_Int32 nService(0); nService < aServices.getLength(); nService++) { @@ -206,7 +206,7 @@ namespace drawinglayer return sal_False; } - uno::Sequence< rtl::OUString > SAL_CALL XPrimitive2DRenderer::getSupportedServiceNames() throw(uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL XPrimitive2DRenderer::getSupportedServiceNames() throw(uno::RuntimeException) { return XPrimitive2DRenderer_getSupportedServiceNames(); } diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx index 484a18e0b103..50d509f67586 100644 --- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx +++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx @@ -383,7 +383,7 @@ void EnhancedShapeDumper::dumpEnhancedCustomShapeGeometryService(uno::Reference< { { uno::Any anotherAny = xPropSet->getPropertyValue("Type"); - rtl::OUString sType; + OUString sType; if(anotherAny >>= sType) dumpTypeAsAttribute(sType); } @@ -437,7 +437,7 @@ void EnhancedShapeDumper::dumpEnhancedCustomShapeGeometryService(uno::Reference< } { uno::Any anotherAny = xPropSet->getPropertyValue("Equations"); - uno::Sequence< rtl::OUString > aEquations; + uno::Sequence< OUString > aEquations; if(anotherAny >>= aEquations) dumpEquationsAsElement(aEquations); } @@ -448,10 +448,10 @@ void EnhancedShapeDumper::dumpEnhancedCustomShapeGeometryService(uno::Reference< dumpHandlesAsElement(aHandles); } } -void EnhancedShapeDumper::dumpTypeAsAttribute(rtl::OUString sType) +void EnhancedShapeDumper::dumpTypeAsAttribute(OUString sType) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("type"), "%s", - rtl::OUStringToOString(sType, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sType, RTL_TEXTENCODING_UTF8).getStr()); } void EnhancedShapeDumper::dumpViewBoxAsElement(awt::Rectangle aViewBox) @@ -493,11 +493,11 @@ void EnhancedShapeDumper::dumpAdjustmentValuesAsElement(uno::Sequence< drawing:: { xmlTextWriterStartElement(xmlWriter, BAD_CAST( "EnhancedCustomShapeAdjustmentValue" )); uno::Any aAny = aAdjustmentValues[i].Value; - rtl::OUString sValue; + OUString sValue; if(aAny >>= sValue) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("value"), "%s", - rtl::OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr()); } switch(aAdjustmentValues[i].State) { @@ -523,15 +523,15 @@ void EnhancedShapeDumper::dumpPropertyValueAsElement(beans::PropertyValue aPrope xmlTextWriterStartElement(xmlWriter, BAD_CAST( "PropertyValue" )); xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("name"), "%s", - rtl::OUStringToOString(aPropertyValue.Name, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aPropertyValue.Name, RTL_TEXTENCODING_UTF8).getStr()); xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("handle"), "%" SAL_PRIdINT32, aPropertyValue.Handle); uno::Any aAny = aPropertyValue.Value; - rtl::OUString sValue; + OUString sValue; if(aAny >>= sValue) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("value"), "%s", - rtl::OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr()); } switch(aPropertyValue.State) { @@ -583,14 +583,14 @@ void EnhancedShapeDumper::dumpTextPathAsElement(uno::Sequence< beans::PropertyVa xmlTextWriterEndElement( xmlWriter ); } -void EnhancedShapeDumper::dumpEquationsAsElement(uno::Sequence< rtl::OUString > aEquations) +void EnhancedShapeDumper::dumpEquationsAsElement(uno::Sequence< OUString > aEquations) { xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Equations" )); sal_Int32 nLength = aEquations.getLength(); for (sal_Int32 i = 0; i < nLength; ++i) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("name"), "%s", - rtl::OUStringToOString(aEquations[i], RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aEquations[i], RTL_TEXTENCODING_UTF8).getStr()); } xmlTextWriterEndElement( xmlWriter ); } @@ -759,11 +759,11 @@ void EnhancedShapeDumper::dumpRefRAsAttribute(sal_Int32 aRefR) void EnhancedShapeDumper::dumpEnhancedCustomShapeParameter(drawing::EnhancedCustomShapeParameter aParameter) { uno::Any aAny = aParameter.Value; - rtl::OUString sValue; + OUString sValue; if(aAny >>= sValue) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("value"), "%s", - rtl::OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr()); } sal_Int32 aType = aParameter.Type; xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("type"), "%" SAL_PRIdINT32, aType); diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx index 7ed9359535f7..22f6ea517b0f 100644 --- a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx +++ b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx @@ -94,7 +94,7 @@ public: // EnhancedCustomShapeGeometry.idl void dumpEnhancedCustomShapeGeometryService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet); - void dumpTypeAsAttribute(rtl::OUString sType); + void dumpTypeAsAttribute(OUString sType); void dumpViewBoxAsElement(com::sun::star::awt::Rectangle aViewBox); void dumpMirroredXAsAttribute(sal_Bool bMirroredX); // also used in EnhancedCustomShapeHandle void dumpMirroredYAsAttribute(sal_Bool bMirroredY); // also used in EnhancedCustomShapeHandle @@ -103,7 +103,7 @@ public: void dumpExtrusionAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aExtrusion); void dumpPathAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aPath); void dumpTextPathAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aTextPath); - void dumpEquationsAsElement(com::sun::star::uno::Sequence< rtl::OUString > aEquations); + void dumpEquationsAsElement(com::sun::star::uno::Sequence< OUString > aEquations); void dumpHandlesAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > aHandles); // EnhancedCustomShapeHandle.idl diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index 41ae941cd75c..b5dd1636db23 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -61,14 +61,14 @@ void dumpPointSequenceSequence(com::sun::star::drawing::PointSequenceSequence aP void dumpFillStyleAsAttribute(com::sun::star::drawing::FillStyle eFillStyle, xmlTextWriterPtr xmlWriter); void dumpFillColorAsAttribute(sal_Int32 aColor, xmlTextWriterPtr xmlWriter); void dumpFillTransparenceAsAttribute(sal_Int32 aTransparence, xmlTextWriterPtr xmlWriter); -void dumpFillTransparenceGradientNameAsAttribute(rtl::OUString sTranspGradName, xmlTextWriterPtr xmlWriter); +void dumpFillTransparenceGradientNameAsAttribute(OUString sTranspGradName, xmlTextWriterPtr xmlWriter); void dumpFillTransparenceGradientAsElement(com::sun::star::awt::Gradient aTranspGrad, xmlTextWriterPtr xmlWriter); -void dumpFillGradientNameAsAttribute(rtl::OUString sGradName, xmlTextWriterPtr xmlWriter); +void dumpFillGradientNameAsAttribute(OUString sGradName, xmlTextWriterPtr xmlWriter); void dumpFillGradientAsElement(com::sun::star::awt::Gradient aGradient, xmlTextWriterPtr xmlWriter); void dumpFillHatchAsElement(com::sun::star::drawing::Hatch aHatch, xmlTextWriterPtr xmlWriter); void dumpFillBackgroundAsAttribute(sal_Bool bBackground, xmlTextWriterPtr xmlWriter); void dumpFillBitmapAsElement(com::sun::star::uno::Reference<com::sun::star::awt::XBitmap> xBitmap, xmlTextWriterPtr xmlWriter); -void dumpFillBitmapURLAsAttribute(rtl::OUString sBitmapURL, xmlTextWriterPtr xmlWriter); +void dumpFillBitmapURLAsAttribute(OUString sBitmapURL, xmlTextWriterPtr xmlWriter); void dumpFillBitmapPositionOffsetXAsAttribute(sal_Int32 aBitmapPositionOffsetX, xmlTextWriterPtr xmlWriter); void dumpFillBitmapPositionOffsetYAsAttribute(sal_Int32 aBitmapPositionOffsetY, xmlTextWriterPtr xmlWriter); void dumpFillBitmapOffsetXAsAttribute(sal_Int32 aBitmapOffsetX, xmlTextWriterPtr xmlWriter); @@ -84,13 +84,13 @@ void dumpFillBitmapTileAsAttribute(sal_Bool bBitmapTile, xmlTextWriterPtr xmlWri // LineProperties.idl void dumpLineStyleAsAttribute(com::sun::star::drawing::LineStyle eLineStyle, xmlTextWriterPtr xmlWriter); void dumpLineDashAsElement(com::sun::star::drawing::LineDash aLineDash, xmlTextWriterPtr xmlWriter); -void dumpLineDashNameAsAttribute(rtl::OUString sLineDashName, xmlTextWriterPtr xmlWriter); +void dumpLineDashNameAsAttribute(OUString sLineDashName, xmlTextWriterPtr xmlWriter); void dumpLineColorAsAttribute(sal_Int32 aLineColor, xmlTextWriterPtr xmlWriter); void dumpLineTransparenceAsAttribute(sal_Int32 aLineTransparence, xmlTextWriterPtr xmlWriter); void dumpLineWidthAsAttribute(sal_Int32 aLineWidth, xmlTextWriterPtr xmlWriter); void dumpLineJointAsAttribute(com::sun::star::drawing::LineJoint eLineJoint, xmlTextWriterPtr xmlWriter); -void dumpLineStartNameAsAttribute(rtl::OUString sLineStartName, xmlTextWriterPtr xmlWriter); -void dumpLineEndNameAsAttribute(rtl::OUString sLineEndName, xmlTextWriterPtr xmlWriter); +void dumpLineStartNameAsAttribute(OUString sLineStartName, xmlTextWriterPtr xmlWriter); +void dumpLineEndNameAsAttribute(OUString sLineEndName, xmlTextWriterPtr xmlWriter); void dumpLineStartAsElement(com::sun::star::drawing::PolyPolygonBezierCoords aLineStart, xmlTextWriterPtr xmlWriter); void dumpLineEndAsElement(com::sun::star::drawing::PolyPolygonBezierCoords aLineEnd, xmlTextWriterPtr xmlWriter); void dumpLineStartCenterAsAttribute(sal_Bool bLineStartCenter, xmlTextWriterPtr xmlWriter); @@ -138,22 +138,22 @@ void dumpShadowYDistanceAsAttribute(sal_Int32 aShadowYDistance, xmlTextWriterPtr //Shape.idl void dumpZOrderAsAttribute(sal_Int32 aZOrder, xmlTextWriterPtr xmlWriter); void dumpLayerIDAsAttribute(sal_Int32 aLayerID, xmlTextWriterPtr xmlWriter); -void dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter); +void dumpLayerNameAsAttribute(OUString sLayerName, xmlTextWriterPtr xmlWriter); void dumpVisibleAsAttribute(sal_Bool bVisible, xmlTextWriterPtr xmlWriter); void dumpPrintableAsAttribute(sal_Bool bPrintable, xmlTextWriterPtr xmlWriter); void dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr xmlWriter); -void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter); +void dumpNameAsAttribute(OUString sName, xmlTextWriterPtr xmlWriter); void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr xmlWriter); void dumpHomogenMatrixLine3(com::sun::star::drawing::HomogenMatrixLine3 aLine, xmlTextWriterPtr xmlWriter); void dumpTransformationAsElement(com::sun::star::drawing::HomogenMatrix3 aTransformation, xmlTextWriterPtr xmlWriter); void dumpNavigationOrderAsAttribute(sal_Int32 aNavigationOrder, xmlTextWriterPtr xmlWriter); -void dumpHyperlinkAsAttribute(rtl::OUString sHyperlink, xmlTextWriterPtr xmlWriter); +void dumpHyperlinkAsAttribute(OUString sHyperlink, xmlTextWriterPtr xmlWriter); // CustomShape.idl -void dumpCustomShapeEngineAsAttribute(rtl::OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter); -void dumpCustomShapeDataAsAttribute(rtl::OUString sCustomShapeData, xmlTextWriterPtr xmlWriter); +void dumpCustomShapeEngineAsAttribute(OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter); +void dumpCustomShapeDataAsAttribute(OUString sCustomShapeData, xmlTextWriterPtr xmlWriter); void dumpCustomShapeGeometryAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue> aCustomShapeGeometry, xmlTextWriterPtr xmlWriter); -void dumpCustomShapeReplacementURLAsAttribute(rtl::OUString sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter); +void dumpCustomShapeReplacementURLAsAttribute(OUString sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter); // XShape.idl void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, xmlTextWriterPtr xmlWriter); @@ -175,7 +175,7 @@ void dumpCustomShapeService(com::sun::star::uno::Reference< com::sun::star::bean int writeCallback(void* pContext, const char* sBuffer, int nLen) { - rtl::OStringBuffer* pBuffer = static_cast<rtl::OStringBuffer*>(pContext); + OStringBuffer* pBuffer = static_cast<OStringBuffer*>(pContext); pBuffer->append(sBuffer); return nLen; } @@ -222,10 +222,10 @@ void dumpFillTransparenceAsAttribute(sal_Int32 aTransparence, xmlTextWriterPtr x xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillTransparence"), "%" SAL_PRIdINT32, aTransparence); } -void dumpFillTransparenceGradientNameAsAttribute(rtl::OUString sTranspGradName, xmlTextWriterPtr xmlWriter) +void dumpFillTransparenceGradientNameAsAttribute(OUString sTranspGradName, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillTransparenceGradientName"), "%s", - rtl::OUStringToOString(sTranspGradName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sTranspGradName, RTL_TEXTENCODING_UTF8).getStr()); } //because there's more awt::Gradient properties to dump @@ -272,10 +272,10 @@ void dumpFillTransparenceGradientAsElement(awt::Gradient aTranspGrad, xmlTextWri xmlTextWriterEndElement( xmlWriter ); } -void dumpFillGradientNameAsAttribute(rtl::OUString sGradName, xmlTextWriterPtr xmlWriter) +void dumpFillGradientNameAsAttribute(OUString sGradName, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillGradientName"), "%s", - rtl::OUStringToOString(sGradName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sGradName, RTL_TEXTENCODING_UTF8).getStr()); } void dumpFillGradientAsElement(awt::Gradient aGradient, xmlTextWriterPtr xmlWriter) @@ -328,10 +328,10 @@ void dumpFillBitmapAsElement(uno::Reference<awt::XBitmap> xBitmap, xmlTextWriter xmlTextWriterEndElement( xmlWriter ); } -void dumpFillBitmapURLAsAttribute(rtl::OUString sBitmapURL, xmlTextWriterPtr xmlWriter) +void dumpFillBitmapURLAsAttribute(OUString sBitmapURL, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fillBitmapURL"), "%s", - rtl::OUStringToOString(sBitmapURL, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sBitmapURL, RTL_TEXTENCODING_UTF8).getStr()); } void dumpFillBitmapPositionOffsetXAsAttribute(sal_Int32 aBitmapPositionOffsetX, xmlTextWriterPtr xmlWriter) @@ -492,10 +492,10 @@ void dumpLineDashAsElement(drawing::LineDash aLineDash, xmlTextWriterPtr xmlWrit xmlTextWriterEndElement( xmlWriter ); } -void dumpLineDashNameAsAttribute(rtl::OUString sLineDashName, xmlTextWriterPtr xmlWriter) +void dumpLineDashNameAsAttribute(OUString sLineDashName, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineDashName"), "%s", - rtl::OUStringToOString(sLineDashName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sLineDashName, RTL_TEXTENCODING_UTF8).getStr()); } void dumpLineColorAsAttribute(sal_Int32 aLineColor, xmlTextWriterPtr xmlWriter) @@ -537,16 +537,16 @@ void dumpLineJointAsAttribute(drawing::LineJoint eLineJoint, xmlTextWriterPtr xm } } -void dumpLineStartNameAsAttribute(rtl::OUString sLineStartName, xmlTextWriterPtr xmlWriter) +void dumpLineStartNameAsAttribute(OUString sLineStartName, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineStartName"), "%s", - rtl::OUStringToOString(sLineStartName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sLineStartName, RTL_TEXTENCODING_UTF8).getStr()); } -void dumpLineEndNameAsAttribute(rtl::OUString sLineEndName, xmlTextWriterPtr xmlWriter) +void dumpLineEndNameAsAttribute(OUString sLineEndName, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineEndName"), "%s", - rtl::OUStringToOString(sLineEndName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sLineEndName, RTL_TEXTENCODING_UTF8).getStr()); } void dumpPolyPolygonBezierCoords(drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords, xmlTextWriterPtr xmlWriter) @@ -977,10 +977,10 @@ void dumpLayerIDAsAttribute(sal_Int32 aLayerID, xmlTextWriterPtr xmlWriter) xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("layerID"), "%" SAL_PRIdINT32, aLayerID); } -void dumpLayerNameAsAttribute(rtl::OUString sLayerName, xmlTextWriterPtr xmlWriter) +void dumpLayerNameAsAttribute(OUString sLayerName, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("layerName"), "%s", - rtl::OUStringToOString(sLayerName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sLayerName, RTL_TEXTENCODING_UTF8).getStr()); } void dumpVisibleAsAttribute(sal_Bool bVisible, xmlTextWriterPtr xmlWriter) @@ -1007,10 +1007,10 @@ void dumpMoveProtectAsAttribute(sal_Bool bMoveProtect, xmlTextWriterPtr xmlWrite xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("moveProtect"), "%s", "false"); } -void dumpNameAsAttribute(rtl::OUString sName, xmlTextWriterPtr xmlWriter) +void dumpNameAsAttribute(OUString sName, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("name"), "%s", - rtl::OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sName, RTL_TEXTENCODING_UTF8).getStr()); } void dumpSizeProtectAsAttribute(sal_Bool bSizeProtect, xmlTextWriterPtr xmlWriter) @@ -1050,10 +1050,10 @@ void dumpNavigationOrderAsAttribute(sal_Int32 aNavigationOrder, xmlTextWriterPtr xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("navigationOrder"), "%" SAL_PRIdINT32, aNavigationOrder); } -void dumpHyperlinkAsAttribute(rtl::OUString sHyperlink, xmlTextWriterPtr xmlWriter) +void dumpHyperlinkAsAttribute(OUString sHyperlink, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("hyperlink"), "%s", - rtl::OUStringToOString(sHyperlink, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sHyperlink, RTL_TEXTENCODING_UTF8).getStr()); } // -------------------------------- @@ -1075,23 +1075,23 @@ void dumpSizeAsAttribute(const awt::Size& rSize, xmlTextWriterPtr xmlWriter) void dumpShapeDescriptorAsAttribute( uno::Reference< drawing::XShapeDescriptor > xDescr, xmlTextWriterPtr xmlWriter ) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("type"), "%s", - rtl::OUStringToOString(xDescr->getShapeType(), RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(xDescr->getShapeType(), RTL_TEXTENCODING_UTF8).getStr()); } // ------------------------------------- // ---------- CustomShape.idl ---------- // ------------------------------------- -void dumpCustomShapeEngineAsAttribute(rtl::OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter) +void dumpCustomShapeEngineAsAttribute(OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("customShapeEngine"), "%s", - rtl::OUStringToOString(sCustomShapeEngine, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sCustomShapeEngine, RTL_TEXTENCODING_UTF8).getStr()); } -void dumpCustomShapeDataAsAttribute(rtl::OUString sCustomShapeData, xmlTextWriterPtr xmlWriter) +void dumpCustomShapeDataAsAttribute(OUString sCustomShapeData, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("customShapeData"), "%s", - rtl::OUStringToOString(sCustomShapeData, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sCustomShapeData, RTL_TEXTENCODING_UTF8).getStr()); } void dumpCustomShapeGeometryAsElement(uno::Sequence< beans::PropertyValue> aCustomShapeGeometry, xmlTextWriterPtr xmlWriter) @@ -1103,15 +1103,15 @@ void dumpCustomShapeGeometryAsElement(uno::Sequence< beans::PropertyValue> aCust xmlTextWriterStartElement(xmlWriter, BAD_CAST( "PropertyValue" )); xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("name"), "%s", - rtl::OUStringToOString(aCustomShapeGeometry[i].Name, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(aCustomShapeGeometry[i].Name, RTL_TEXTENCODING_UTF8).getStr()); xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("handle"), "%" SAL_PRIdINT32, aCustomShapeGeometry[i].Handle); uno::Any aAny = aCustomShapeGeometry[i].Value; - rtl::OUString sValue; + OUString sValue; if(aAny >>= sValue) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("value"), "%s", - rtl::OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sValue, RTL_TEXTENCODING_UTF8).getStr()); } switch(aCustomShapeGeometry[i].State) { @@ -1132,10 +1132,10 @@ void dumpCustomShapeGeometryAsElement(uno::Sequence< beans::PropertyValue> aCust xmlTextWriterEndElement( xmlWriter ); } -void dumpCustomShapeReplacementURLAsAttribute(rtl::OUString sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter) +void dumpCustomShapeReplacementURLAsAttribute(OUString sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter) { xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("customShapeReplacementURL"), "%s", - rtl::OUStringToOString(sCustomShapeReplacementURL, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(sCustomShapeReplacementURL, RTL_TEXTENCODING_UTF8).getStr()); } // methods dumping whole services @@ -1306,7 +1306,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("FillTransparenceGradientName"); - rtl::OUString sTranspGradName; + OUString sTranspGradName; if(anotherAny >>= sTranspGradName) dumpFillTransparenceGradientNameAsAttribute(sTranspGradName, xmlWriter); } @@ -1318,7 +1318,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("FillGradientName"); - rtl::OUString sGradName; + OUString sGradName; if(anotherAny >>= sGradName) dumpFillGradientNameAsAttribute(sGradName, xmlWriter); } @@ -1330,7 +1330,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("FillHatchName"); - rtl::OUString sHatchName; + OUString sHatchName; if(anotherAny >>= sHatchName) dumpFillGradientNameAsAttribute(sHatchName, xmlWriter); } @@ -1348,7 +1348,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("FillBitmapName"); - rtl::OUString sBitmapName; + OUString sBitmapName; if(anotherAny >>= sBitmapName) dumpFillGradientNameAsAttribute(sBitmapName, xmlWriter); } @@ -1360,7 +1360,7 @@ void dumpFillPropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("FillBitmapURL"); - rtl::OUString sBitmapURL; + OUString sBitmapURL; if(anotherAny >>= sBitmapURL) dumpFillBitmapURLAsAttribute(sBitmapURL, xmlWriter); } @@ -1448,7 +1448,7 @@ void dumpLinePropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("LineDashName"); - rtl::OUString sLineDashName; + OUString sLineDashName; if(anotherAny >>= sLineDashName) dumpLineDashNameAsAttribute(sLineDashName, xmlWriter); } @@ -1478,13 +1478,13 @@ void dumpLinePropertiesService(uno::Reference< beans::XPropertySet > xPropSet, x } { uno::Any anotherAny = xPropSet->getPropertyValue("LineStartName"); - rtl::OUString sLineStartName; + OUString sLineStartName; if(anotherAny >>= sLineStartName) dumpLineStartNameAsAttribute(sLineStartName, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("LineEndName"); - rtl::OUString sLineEndName; + OUString sLineEndName; if(anotherAny >>= sLineEndName) dumpLineEndNameAsAttribute(sLineEndName, xmlWriter); } @@ -1599,7 +1599,7 @@ void dumpShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlTextWri } { uno::Any anotherAny = xPropSet->getPropertyValue("LayerName"); - rtl::OUString sLayerName; + OUString sLayerName; if(anotherAny >>= sLayerName) dumpLayerNameAsAttribute(sLayerName, xmlWriter); } @@ -1623,7 +1623,7 @@ void dumpShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlTextWri } { uno::Any anotherAny = xPropSet->getPropertyValue("Name"); - rtl::OUString sName; + OUString sName; if(anotherAny >>= sName) dumpNameAsAttribute(sName, xmlWriter); } @@ -1648,7 +1648,7 @@ void dumpShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlTextWri if(xInfo->hasPropertyByName("Hyperlink")) { uno::Any anotherAny = xPropSet->getPropertyValue("Hyperlink"); - rtl::OUString sHyperlink; + OUString sHyperlink; if(anotherAny >>= sHyperlink) dumpHyperlinkAsAttribute(sHyperlink, xmlWriter); } @@ -1681,13 +1681,13 @@ void dumpCustomShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlT uno::Reference< beans::XPropertySetInfo> xInfo = xPropSet->getPropertySetInfo(); { uno::Any anotherAny = xPropSet->getPropertyValue("CustomShapeEngine"); - rtl::OUString sCustomShapeEngine; + OUString sCustomShapeEngine; if(anotherAny >>= sCustomShapeEngine) dumpCustomShapeEngineAsAttribute(sCustomShapeEngine, xmlWriter); } { uno::Any anotherAny = xPropSet->getPropertyValue("CustomShapeData"); - rtl::OUString sCustomShapeData; + OUString sCustomShapeData; if(anotherAny >>= sCustomShapeData) dumpCustomShapeDataAsAttribute(sCustomShapeData, xmlWriter); } @@ -1700,7 +1700,7 @@ void dumpCustomShapeService(uno::Reference< beans::XPropertySet > xPropSet, xmlT if(xInfo->hasPropertyByName("CustomShapeReplacementURL")) { uno::Any anotherAny = xPropSet->getPropertyValue("CustomShapeReplacementURL"); - rtl::OUString sCustomShapeReplacementURL; + OUString sCustomShapeReplacementURL; if(anotherAny >>= sCustomShapeReplacementURL) dumpCustomShapeReplacementURLAsAttribute(sCustomShapeReplacementURL, xmlWriter); } @@ -1711,7 +1711,7 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr xmlTextWriterStartElement( xmlWriter, BAD_CAST( "XShape" ) ); uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySetInfo> xPropSetInfo = xPropSet->getPropertySetInfo(); - rtl::OUString aName; + OUString aName; dumpPositionAsAttribute(xShape->getPosition(), xmlWriter); dumpSizeAsAttribute(xShape->getSize(), xmlWriter); @@ -1721,7 +1721,7 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr // uno::Sequence<beans::Property> aProperties = xPropSetInfo->getProperties(); uno::Reference< lang::XServiceInfo > xServiceInfo( xShape, uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aServiceNames = xServiceInfo->getSupportedServiceNames(); + uno::Sequence< OUString > aServiceNames = xServiceInfo->getSupportedServiceNames(); uno::Reference< beans::XPropertySetInfo> xInfo = xPropSet->getPropertySetInfo(); if(xInfo->hasPropertyByName("Name")) @@ -1730,7 +1730,7 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr if (aAny >>= aName) { if (!aName.isEmpty()) - xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("name"), "%s", rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr()); + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("name"), "%s", OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -1739,9 +1739,9 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr if (xServiceInfo->supportsService("com.sun.star.drawing.Text")) { uno::Reference< text::XText > xText(xShape, uno::UNO_QUERY_THROW); - rtl::OUString aText = xText->getString(); + OUString aText = xText->getString(); if(!aText.isEmpty()) - xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("text"), "%s", rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); + xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("text"), "%s", OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr()); } if(xServiceInfo->supportsService("com.sun.star.drawing.TextProperties")) dumpTextPropertiesService(xPropSet, xmlWriter); @@ -1810,7 +1810,7 @@ void dumpXShape(uno::Reference< drawing::XShape > xShape, xmlTextWriterPtr xmlWr for (sal_Int32 i = 0; i < nServices; ++i) { xmlTextWriterStartElement(xmlWriter, BAD_CAST( "ServiceName" )); - xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST( "name" ), "%s", rtl::OUStringToOString(aServiceNames[i], RTL_TEXTENCODING_UTF8).getStr()); + xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST( "name" ), "%s", OUStringToOString(aServiceNames[i], RTL_TEXTENCODING_UTF8).getStr()); xmlTextWriterEndElement( xmlWriter ); } #endif @@ -1833,10 +1833,10 @@ void dumpXShapes( uno::Reference< drawing::XShapes > xShapes, xmlTextWriterPtr x } } //end of namespace -rtl::OUString XShapeDumper::dump(uno::Reference<drawing::XShapes> xPageShapes) +OUString XShapeDumper::dump(uno::Reference<drawing::XShapes> xPageShapes) { - rtl::OStringBuffer aString; + OStringBuffer aString; xmlOutputBufferPtr xmlOutBuffer = xmlOutputBufferCreateIO( writeCallback, closeCallback, &aString, NULL ); xmlTextWriterPtr xmlWriter = xmlNewTextWriter( xmlOutBuffer ); xmlTextWriterSetIndent( xmlWriter, 1 ); diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 69b541d6ee7d..f7d0de8f0b85 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -80,39 +80,39 @@ namespace drawinglayer uno::Sequence< beans::PropertyValue > mxExtendedInformation; // the local UNO API strings - const ::rtl::OUString& getNamePropertyObjectTransformation() + const OUString& getNamePropertyObjectTransformation() { - static ::rtl::OUString s_sNameProperty("ObjectTransformation"); + static OUString s_sNameProperty("ObjectTransformation"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyViewTransformation() + const OUString& getNamePropertyViewTransformation() { - static ::rtl::OUString s_sNameProperty("ViewTransformation"); + static OUString s_sNameProperty("ViewTransformation"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyViewport() + const OUString& getNamePropertyViewport() { - static ::rtl::OUString s_sNameProperty("Viewport"); + static OUString s_sNameProperty("Viewport"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyTime() + const OUString& getNamePropertyTime() { - static ::rtl::OUString s_sNameProperty("Time"); + static OUString s_sNameProperty("Time"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyVisualizedPage() + const OUString& getNamePropertyVisualizedPage() { - static ::rtl::OUString s_sNameProperty("VisualizedPage"); + static OUString s_sNameProperty("VisualizedPage"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyReducedDisplayQuality() + const OUString& getNamePropertyReducedDisplayQuality() { - static ::rtl::OUString s_sNameProperty("ReducedDisplayQuality"); + static OUString s_sNameProperty("ReducedDisplayQuality"); return s_sNameProperty; } diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index 3569a2d298bc..7593dc0045f0 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -77,57 +77,57 @@ namespace drawinglayer uno::Sequence< beans::PropertyValue > mxExtendedInformation; // the local UNO API strings - const ::rtl::OUString& getNamePropertyObjectTransformation() + const OUString& getNamePropertyObjectTransformation() { - static ::rtl::OUString s_sNameProperty("ObjectTransformation"); + static OUString s_sNameProperty("ObjectTransformation"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyOrientation() + const OUString& getNamePropertyOrientation() { - static ::rtl::OUString s_sNameProperty("Orientation"); + static OUString s_sNameProperty("Orientation"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyProjection() + const OUString& getNamePropertyProjection() { - static ::rtl::OUString s_sNameProperty("Projection"); + static OUString s_sNameProperty("Projection"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyProjection_30() + const OUString& getNamePropertyProjection_30() { - static ::rtl::OUString s_sNameProperty("Projection30"); + static OUString s_sNameProperty("Projection30"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyProjection_31() + const OUString& getNamePropertyProjection_31() { - static ::rtl::OUString s_sNameProperty("Projection31"); + static OUString s_sNameProperty("Projection31"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyProjection_32() + const OUString& getNamePropertyProjection_32() { - static ::rtl::OUString s_sNameProperty("Projection32"); + static OUString s_sNameProperty("Projection32"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyProjection_33() + const OUString& getNamePropertyProjection_33() { - static ::rtl::OUString s_sNameProperty("Projection33"); + static OUString s_sNameProperty("Projection33"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyDeviceToView() + const OUString& getNamePropertyDeviceToView() { - static ::rtl::OUString s_sNameProperty("DeviceToView"); + static OUString s_sNameProperty("DeviceToView"); return s_sNameProperty; } - const ::rtl::OUString& getNamePropertyTime() + const OUString& getNamePropertyTime() { - static ::rtl::OUString s_sNamePropertyTime("Time"); + static OUString s_sNamePropertyTime("Time"); return s_sNamePropertyTime; } diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 0c94adaa6857..74c40dfc773e 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -56,7 +56,7 @@ namespace drawinglayer if(xSet.is()) { uno::Any aValue(xSet->getPropertyValue("DefaultControl")); - rtl::OUString aUnoControlTypeName; + OUString aUnoControlTypeName; if(aValue >>= aUnoControlTypeName) { diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index 5597bfc40b97..2f314dd6424e 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -95,7 +95,7 @@ namespace drawinglayer MediaPrimitive2D::MediaPrimitive2D( const basegfx::B2DHomMatrix& rTransform, - const rtl::OUString& rURL, + const OUString& rURL, const basegfx::BColor& rBackgroundColor, sal_uInt32 nDiscreteBorder, const Graphic &rSnapshot) diff --git a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx index e87b7c184ba7..d4df4ea60bcd 100644 --- a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx @@ -30,9 +30,9 @@ namespace drawinglayer { ObjectInfoPrimitive2D::ObjectInfoPrimitive2D( const Primitive2DSequence& rChildren, - const rtl::OUString& rName, - const rtl::OUString& rTitle, - const rtl::OUString& rDesc) + const OUString& rName, + const OUString& rTitle, + const OUString& rDesc) : GroupPrimitive2D(rChildren), maName(rName), maTitle(rTitle), diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index 60f943d94b20..33554bd92624 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx @@ -197,7 +197,7 @@ namespace drawinglayer xBreakIterator = ::com::sun::star::i18n::BreakIterator::create(xContext); } - const rtl::OUString& rTxt = mrSource.getText(); + const OUString& rTxt = mrSource.getText(); const sal_Int32 nTextLength(mrSource.getTextLength()); const ::com::sun::star::lang::Locale& rLocale = mrSource.getLocale(); const sal_Int32 nTextPosition(mrSource.getTextPosition()); diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx index c100496fd8c8..9799060da899 100644 --- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx @@ -101,7 +101,7 @@ namespace drawinglayer TextHierarchyFieldPrimitive2D::TextHierarchyFieldPrimitive2D( const Primitive2DSequence& rChildren, const FieldType& rFieldType, - const rtl::OUString& rString) + const OUString& rString) : GroupPrimitive2D(rChildren), meType(rFieldType), maString(rString) diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index ec0ae58e1fe8..f3e2abb5448a 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -69,7 +69,7 @@ namespace drawinglayer Primitive2DSequence TextCharacterStrikeoutPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { // strikeout with character - const rtl::OUString aSingleCharString(getStrikeoutChar()); + const OUString aSingleCharString(getStrikeoutChar()); basegfx::B2DVector aScale, aTranslate; double fRotate, fShearX; diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index ada69e6e29ed..73746e53149f 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -877,7 +877,7 @@ namespace drawinglayer uno::Reference< beans::XPropertySetInfo > xPropertyInfo(xModelProperties.is() ? xModelProperties->getPropertySetInfo() : uno::Reference< beans::XPropertySetInfo >()); - const ::rtl::OUString sPrintablePropertyName("Printable"); + const OUString sPrintablePropertyName("Printable"); if(xPropertyInfo.is() && xPropertyInfo->hasPropertyByName(sPrintablePropertyName)) { @@ -981,9 +981,9 @@ namespace drawinglayer // support for FIELD_SEQ_BEGIN, FIELD_SEQ_END and URL. It wraps text primitives (but is not limited to) // thus do the MetafileAction embedding stuff but just handle recursively. const primitive2d::TextHierarchyFieldPrimitive2D& rFieldPrimitive = static_cast< const primitive2d::TextHierarchyFieldPrimitive2D& >(rCandidate); - const rtl::OString aCommentStringCommon(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN")); - const rtl::OString aCommentStringPage(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN;PageField")); - const rtl::OString aCommentStringEnd(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END")); + const OString aCommentStringCommon(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN")); + const OString aCommentStringPage(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN;PageField")); + const OString aCommentStringEnd(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END")); switch(rFieldPrimitive.getType()) { @@ -999,7 +999,7 @@ namespace drawinglayer } case drawinglayer::primitive2d::FIELD_TYPE_URL : { - const rtl::OUString& rURL = rFieldPrimitive.getString(); + const OUString& rURL = rFieldPrimitive.getString(); const String aOldString(rURL); mpMetaFile->AddAction(new MetaCommentAction(aCommentStringCommon, 0, reinterpret_cast< const sal_uInt8* >(aOldString.GetBuffer()), 2 * aOldString.Len())); break; @@ -1032,7 +1032,7 @@ namespace drawinglayer case PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D : { const primitive2d::TextHierarchyLinePrimitive2D& rLinePrimitive = static_cast< const primitive2d::TextHierarchyLinePrimitive2D& >(rCandidate); - const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")); + const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL")); // process recursively and add MetaFile comment process(rLinePrimitive.get2DDecomposition(getViewInformation2D())); @@ -1045,7 +1045,7 @@ namespace drawinglayer // in Outliner::PaintBullet(), a MetafileComment for bullets is added, too. The // "XTEXT_EOC" is used, use here, too. const primitive2d::TextHierarchyBulletPrimitive2D& rBulletPrimitive = static_cast< const primitive2d::TextHierarchyBulletPrimitive2D& >(rCandidate); - const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")); + const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")); // process recursively and add MetaFile comment process(rBulletPrimitive.get2DDecomposition(getViewInformation2D())); @@ -1056,7 +1056,7 @@ namespace drawinglayer case PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D : { const primitive2d::TextHierarchyParagraphPrimitive2D& rParagraphPrimitive = static_cast< const primitive2d::TextHierarchyParagraphPrimitive2D& >(rCandidate); - const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")); + const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP")); if(mpPDFExtOutDevData) { @@ -1079,8 +1079,8 @@ namespace drawinglayer case PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D : { const primitive2d::TextHierarchyBlockPrimitive2D& rBlockPrimitive = static_cast< const primitive2d::TextHierarchyBlockPrimitive2D& >(rCandidate); - const rtl::OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN")); - const rtl::OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")); + const OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN")); + const OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END")); // add MetaFile comment, process recursively and add MetaFile comment mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA)); @@ -1115,7 +1115,7 @@ namespace drawinglayer mxBreakIterator = i18n::BreakIterator::create(xContext); } - const rtl::OUString& rTxt = rTextCandidate.getText(); + const OUString& rTxt = rTextCandidate.getText(); const sal_Int32 nTextLength(rTextCandidate.getTextLength()); // rTxt.getLength()); if(nTextLength) @@ -1127,9 +1127,9 @@ namespace drawinglayer sal_Int32 nNextCellBreak(mxBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone)); ::com::sun::star::i18n::Boundary nNextWordBoundary(mxBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True)); sal_Int32 nNextSentenceBreak(mxBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale)); - const rtl::OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")); - const rtl::OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW")); - const rtl::OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS")); + const OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC")); + const OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW")); + const OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS")); for(sal_Int32 i(nTextPosition); i < nTextPosition + nTextLength; i++) { diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 92d843c3acc9..e209f188158f 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -296,7 +296,7 @@ namespace drawinglayer if ( nWidth ) nChars = nWidthToFill / nWidth; - rtl::OUStringBuffer aFilled; + OUStringBuffer aFilled; comphelper::string::padToLength(aFilled, (sal_uInt16)nChars, aText.GetChar(0)); aText = aFilled.makeStringAndClear(); nPos = 0; diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index c4d5bc90fe8b..dc53f27d9b5d 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -122,7 +122,7 @@ namespace drawinglayer static bool bDoSaveForVisualControl(false); if(bDoSaveForVisualControl) { - SvFileStream aNew(rtl::OUString("c:\\test.png"), STREAM_WRITE|STREAM_TRUNC); + SvFileStream aNew(OUString("c:\\test.png"), STREAM_WRITE|STREAM_TRUNC); aNew << aRetval; } #endif |